diff options
author | Justin Clarke Casey | 2008-11-07 22:57:32 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 22:57:32 +0000 |
commit | bf9384d5943e755df9bbfce793c0cd89252e4044 (patch) | |
tree | 4aa927cb3fe4f86ab93d4fdb91e5fdee83031c18 /OpenSim/Region/Environment/Scenes/InnerScene.cs | |
parent | * Fix bug in r7162 where avatars could not move (diff) | |
download | opensim-SC_OLD-bf9384d5943e755df9bbfce793c0cd89252e4044.zip opensim-SC_OLD-bf9384d5943e755df9bbfce793c0cd89252e4044.tar.gz opensim-SC_OLD-bf9384d5943e755df9bbfce793c0cd89252e4044.tar.bz2 opensim-SC_OLD-bf9384d5943e755df9bbfce793c0cd89252e4044.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=2582
* Send prim flags as booleans from LLClientView rather than in the native LL array
* Thanks idb
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 2f7ca21..0b24ce9 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -1194,14 +1194,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1194 | /// <param name="localID"></param> | 1194 | /// <param name="localID"></param> |
1195 | /// <param name="packet"></param> | 1195 | /// <param name="packet"></param> |
1196 | /// <param name="remoteClient"></param> | 1196 | /// <param name="remoteClient"></param> |
1197 | protected internal void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient) | 1197 | protected internal void UpdatePrimFlags(uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, IClientAPI remoteClient) |
1198 | { | 1198 | { |
1199 | SceneObjectGroup group = GetGroupByPrim(localID); | 1199 | SceneObjectGroup group = GetGroupByPrim(localID); |
1200 | if (group != null) | 1200 | if (group != null) |
1201 | { | 1201 | { |
1202 | if (m_parentScene.ExternalChecks.ExternalChecksCanEditObject(group.UUID, remoteClient.AgentId)) | 1202 | if (m_parentScene.ExternalChecks.ExternalChecksCanEditObject(group.UUID, remoteClient.AgentId)) |
1203 | { | 1203 | { |
1204 | group.UpdatePrimFlags(localID, (ushort)packet.Type, true, packet.ToBytes()); | 1204 | group.UpdatePrimFlags(localID, UsePhysics, IsTemporary, IsPhantom); |
1205 | } | 1205 | } |
1206 | } | 1206 | } |
1207 | } | 1207 | } |