diff options
author | Justin Clarke Casey | 2008-11-10 18:10:00 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-10 18:10:00 +0000 |
commit | 5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4 (patch) | |
tree | 8bf214cd45c9a94aae3d6ef8d76169f19006ae41 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | this changeset adds an option to RemoteAdmin to limit the number of (diff) | |
download | opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.zip opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.gz opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.bz2 opensim-SC_OLD-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.xz |
* Extend basic scene test to retrieve the object from the scene and match uuids
* Decouple sog and sop by removing the need to pass the sog to the sop when it is created - most of the code was doing this operation (and hence duplicating it) anyway
* Remove unused constructors
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f1c4c6c..7de6fd1 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
164 | private Thread HeartbeatThread; | 164 | private Thread HeartbeatThread; |
165 | private volatile bool shuttingdown = false; | 165 | private volatile bool shuttingdown = false; |
166 | 166 | ||
167 | private object m_deleting_scene_object = new object(); | 167 | private object m_deleting_scene_object = new object(); |
168 | 168 | ||
169 | #endregion | 169 | #endregion |
170 | 170 | ||
@@ -4009,7 +4009,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
4009 | } | 4009 | } |
4010 | 4010 | ||
4011 | /// <summary> | 4011 | /// <summary> |
4012 | /// | 4012 | /// Get a prim via its local id |
4013 | /// </summary> | 4013 | /// </summary> |
4014 | /// <param name="localID"></param> | 4014 | /// <param name="localID"></param> |
4015 | /// <returns></returns> | 4015 | /// <returns></returns> |
@@ -4019,7 +4019,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
4019 | } | 4019 | } |
4020 | 4020 | ||
4021 | /// <summary> | 4021 | /// <summary> |
4022 | /// | 4022 | /// Get a prim via its UUID |
4023 | /// </summary> | 4023 | /// </summary> |
4024 | /// <param name="fullID"></param> | 4024 | /// <param name="fullID"></param> |
4025 | /// <returns></returns> | 4025 | /// <returns></returns> |