diff options
| author | Melanie | 2010-03-15 17:23:35 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-15 17:23:35 +0000 |
| commit | d3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch) | |
| tree | 07795e74a637ca63d96b5ee06950b8c1a7a99489 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | flip UVs for profile faces (diff) | |
| download | opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2 opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c8ac014..48e34ee 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -2060,6 +2060,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2060 | { | 2060 | { |
| 2061 | m_lastColliders.Remove(localID); | 2061 | m_lastColliders.Remove(localID); |
| 2062 | } | 2062 | } |
| 2063 | |||
| 2063 | if (m_parentGroup == null) | 2064 | if (m_parentGroup == null) |
| 2064 | return; | 2065 | return; |
| 2065 | if (m_parentGroup.IsDeleted) | 2066 | if (m_parentGroup.IsDeleted) |
| @@ -2855,7 +2856,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2855 | { | 2856 | { |
| 2856 | SendFullUpdateToClient(remoteClient, clientFlags); | 2857 | SendFullUpdateToClient(remoteClient, clientFlags); |
| 2857 | } | 2858 | } |
| 2858 | } | 2859 | } |
| 2859 | 2860 | ||
| 2860 | /// <summary> | 2861 | /// <summary> |
| 2861 | /// Send a full update for this part to all clients. | 2862 | /// Send a full update for this part to all clients. |