aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorDiva Canto2013-08-24 03:42:39 -0700
committerDiva Canto2013-08-24 03:42:39 -0700
commit5cd7bc2848a35c16321dea4cf174ed5497b5f62f (patch)
tree9e33467ac1e7135149a45e5f7cba61ba163d28e2 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMake HG logins fall back to fallback regions if the desired region fails. (diff)
parentFix a printing of exception error in InventoryArchiveModule that only (diff)
downloadopensim-SC_OLD-5cd7bc2848a35c16321dea4cf174ed5497b5f62f.zip
opensim-SC_OLD-5cd7bc2848a35c16321dea4cf174ed5497b5f62f.tar.gz
opensim-SC_OLD-5cd7bc2848a35c16321dea4cf174ed5497b5f62f.tar.bz2
opensim-SC_OLD-5cd7bc2848a35c16321dea4cf174ed5497b5f62f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4fc207a..b4e8f09 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3243,11 +3243,6 @@ namespace OpenSim.Region.Framework.Scenes
3243 } 3243 }
3244 } 3244 }
3245 3245
3246 public void RestoreInCurrentScene()
3247 {
3248 AddToPhysicalScene(false); // not exactly false
3249 }
3250
3251 public void Reset() 3246 public void Reset()
3252 { 3247 {
3253// m_log.DebugFormat("[SCENE PRESENCE]: Resetting {0} in {1}", Name, Scene.RegionInfo.RegionName); 3248// m_log.DebugFormat("[SCENE PRESENCE]: Resetting {0} in {1}", Name, Scene.RegionInfo.RegionName);