Skip to content

Commit 79b6285

Browse files
authored
Merge pull request #501 from CesiumGS/null-token
Handle possibility of a null token in the SelectIonTokenWindow
2 parents cefb046 + cd606bc commit 79b6285

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
##### Fixes :wrench:
1515

16+
- Fixed a bug that prevented using the Token panel with a new Cesium ion Server that had never had its token set before.
1617
- Fixed a bug that could cause a crash in `CesiumIonSession` when the object was garbage collected or the AppDomain was unloaded while network requests were in progress.
1718
- Fixed a bug that could cause `CesiumFlyToController` to unexpectedly interrupt a flight.
1819
- glTF `doubleSided` materials are now supported. Previously, models using this property would appear inside-out.

Editor/SelectIonTokenWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void OnGUI()
110110
// The source will be set to "UseExisting" later by RefreshTokens
111111
// if the _specifiedToken is from the currently signed-in ion account.
112112
this._source = IonTokenSource.Specify;
113-
if (this._specifiedToken.Length == 0 && session.IsConnected())
113+
if (string.IsNullOrEmpty(this._specifiedToken) && session.IsConnected())
114114
{
115115
this._source = IonTokenSource.Create;
116116
}

Runtime/CesiumIonServer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public class CesiumIonServer : ScriptableObject
3838
/// found by searching the logged-in Cesium ion account for the
3939
/// DefaultIonAccessToken.
4040
/// </summary>
41-
public string defaultIonAccessTokenId;
41+
public string defaultIonAccessTokenId = "";
4242

4343
/// <summary>
4444
/// The default token used to access Cesium ion assets at runtime. This token
4545
/// is embedded in packaged games for use at runtime.
4646
/// </summary>
47-
public string defaultIonAccessToken;
47+
public string defaultIonAccessToken = "";
4848

4949
// The server URL for which we are currently attempting to deduce an API URL. When this property
5050
// is null, we're not currently loading a config.json in order to deduce an API URL for the server.

0 commit comments

Comments
 (0)