diff options
author | Teravus Ovares | 2007-12-18 12:08:34 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-18 12:08:34 +0000 |
commit | ccc8ffaaec915f0561d9aded6cc4b32b911f473c (patch) | |
tree | e07135474e1986cd09177db8e62787b4f74c114a /OpenSim/Region/Environment/Scenes | |
parent | * Removed redundant code in RestService.cs (diff) | |
download | opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.zip opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.gz opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.bz2 opensim-SC_OLD-ccc8ffaaec915f0561d9aded6cc4b32b911f473c.tar.xz |
* Added Incomplete Handling of the RegionInfoRequest packet
* Added Incomplete Handling of the EstateCovenantRequest packet
* Added Incomplete Handling of the EstateOwnerMessageRequest.ChangeEstateCovenantid method
* Fixed a race condition with avatar animations
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs index d508c9e..82ecda8 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | |||
@@ -59,10 +59,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
59 | } | 59 | } |
60 | 60 | ||
61 | // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); | 61 | // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); |
62 | 62 | ||
63 | foreach (KeyValuePair<string, LLUUID> kp in ScenePresence.Animations.AnimsLLUUID) | 63 | lock (ScenePresence.Animations.AnimsLLUUID) |
64 | { | 64 | { |
65 | AnimsNames.Add(kp.Value, kp.Key); | 65 | foreach (KeyValuePair<string, LLUUID> kp in ScenePresence.Animations.AnimsLLUUID) |
66 | { | ||
67 | AnimsNames.Add(kp.Value, kp.Key); | ||
68 | } | ||
66 | } | 69 | } |
67 | } | 70 | } |
68 | } | 71 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 9ca23d5..eec07fc 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1122,6 +1122,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1122 | client.OnParcelAccessListUpdateRequest += new ParcelAccessListUpdateRequest(m_LandManager.handleParcelAccessUpdateRequest); | 1122 | client.OnParcelAccessListUpdateRequest += new ParcelAccessListUpdateRequest(m_LandManager.handleParcelAccessUpdateRequest); |
1123 | 1123 | ||
1124 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 1124 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
1125 | client.OnRegionInfoRequest += m_estateManager.HandleRegionInfoRequest; | ||
1126 | client.OnEstateCovenantRequest += m_estateManager.HandleEstateCovenantRequest; | ||
1125 | client.OnRequestGodlikePowers += handleRequestGodlikePowers; | 1127 | client.OnRequestGodlikePowers += handleRequestGodlikePowers; |
1126 | client.OnGodKickUser += handleGodlikeKickUser; | 1128 | client.OnGodKickUser += handleGodlikeKickUser; |
1127 | client.OnObjectPermissions += HandleObjectPermissionsUpdate; | 1129 | client.OnObjectPermissions += HandleObjectPermissionsUpdate; |