diff options
author | Justin Clarke Casey | 2008-11-17 16:33:41 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 16:33:41 +0000 |
commit | 99bd7cce2b4be9c3c1c5de6da0343493a7241630 (patch) | |
tree | 9667eead156e0e9fe6e41998ed8de4fd0a16dd89 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-99bd7cce2b4be9c3c1c5de6da0343493a7241630.zip opensim-SC_OLD-99bd7cce2b4be9c3c1c5de6da0343493a7241630.tar.gz opensim-SC_OLD-99bd7cce2b4be9c3c1c5de6da0343493a7241630.tar.bz2 opensim-SC_OLD-99bd7cce2b4be9c3c1c5de6da0343493a7241630.tar.xz |
* Make sure that deleted objects do not send further object updates to the client
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 74fa725..fa656f6 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -2074,6 +2074,9 @@ if (m_shape != null) { | |||
2074 | // | 2074 | // |
2075 | if (ParentGroup.IsSelected && IsAttachment) | 2075 | if (ParentGroup.IsSelected && IsAttachment) |
2076 | return; | 2076 | return; |
2077 | |||
2078 | if (ParentGroup.IsDeleted) | ||
2079 | return; | ||
2077 | 2080 | ||
2078 | clientFlags &= ~(uint) PrimFlags.CreateSelected; | 2081 | clientFlags &= ~(uint) PrimFlags.CreateSelected; |
2079 | 2082 | ||
@@ -2179,16 +2182,7 @@ if (m_shape != null) { | |||
2179 | } | 2182 | } |
2180 | 2183 | ||
2181 | /// <summary> | 2184 | /// <summary> |
2182 | /// Send a terse update to the client. | 2185 | /// Send a terse update to all clients |
2183 | /// </summary> | ||
2184 | /// <param name="remoteClient"></param> | ||
2185 | // public void SendTerseUpdate(IClientAPI remoteClient) | ||
2186 | // { | ||
2187 | // SendTerseUpdateToClient(remoteClient); | ||
2188 | // } | ||
2189 | |||
2190 | /// <summary> | ||
2191 | /// | ||
2192 | /// </summary> | 2186 | /// </summary> |
2193 | public void SendTerseUpdateToAllClients() | 2187 | public void SendTerseUpdateToAllClients() |
2194 | { | 2188 | { |
@@ -2199,11 +2193,6 @@ if (m_shape != null) { | |||
2199 | } | 2193 | } |
2200 | } | 2194 | } |
2201 | 2195 | ||
2202 | // public void SendTerseUpdateToClient(IClientAPI remoteClient, Vector3 lPos) | ||
2203 | // { | ||
2204 | // SendTerseUpdateToClient(remoteclient); | ||
2205 | // } | ||
2206 | |||
2207 | public void SetAttachmentPoint(uint AttachmentPoint) | 2196 | public void SetAttachmentPoint(uint AttachmentPoint) |
2208 | { | 2197 | { |
2209 | this.AttachmentPoint = AttachmentPoint; | 2198 | this.AttachmentPoint = AttachmentPoint; |