diff options
author | Justin Clarke Casey | 2008-09-19 17:41:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-19 17:41:21 +0000 |
commit | 5fb7b485b211bbf19f4531a051b78dde92da4ba3 (patch) | |
tree | 655778d09beb953613b1db282dcf4cc640d90697 /OpenSim/Region/Environment | |
parent | Guard LLRezObject against NaN (diff) | |
download | opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.zip opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.gz opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.bz2 opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.xz |
* Only allow logins on standalone when the sim has completed it's initial startup (script startup doesn't count here)
* There was a small window where region logins were allowed before modules were loaded - avatars logins that hit this window could have caused bad things to happen.
* A similar change will follow for grid mode sometime soon
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 36f86eb..5d55075 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -500,7 +500,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
500 | "[AGENT INVENTORY]: CopyInventoryItem received by {0} with oldAgentID {1}, oldItemID {2}, new FolderID {3}, newName {4}", | 500 | "[AGENT INVENTORY]: CopyInventoryItem received by {0} with oldAgentID {1}, oldItemID {2}, new FolderID {3}, newName {4}", |
501 | remoteClient.AgentId, oldAgentID, oldItemID, newFolderID, newName); | 501 | remoteClient.AgentId, oldAgentID, oldItemID, newFolderID, newName); |
502 | 502 | ||
503 | InventoryItemBase item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(oldItemID); | 503 | InventoryItemBase item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(oldItemID); |
504 | 504 | ||
505 | if (item == null) | 505 | if (item == null) |
506 | { | 506 | { |
@@ -1207,7 +1207,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1207 | // XXX clumsy, possibly should be one call | 1207 | // XXX clumsy, possibly should be one call |
1208 | if (null == item) | 1208 | if (null == item) |
1209 | { | 1209 | { |
1210 | item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID); | 1210 | item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); |
1211 | } | 1211 | } |
1212 | 1212 | ||
1213 | if (item != null) | 1213 | if (item != null) |
@@ -1272,7 +1272,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1272 | // XXX clumsy, possibly should be one call | 1272 | // XXX clumsy, possibly should be one call |
1273 | if (null == item) | 1273 | if (null == item) |
1274 | { | 1274 | { |
1275 | item = CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID); | 1275 | item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); |
1276 | } | 1276 | } |
1277 | 1277 | ||
1278 | if (item != null) | 1278 | if (item != null) |