aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-18 07:27:39 +0000
committerMelanie Thielker2008-10-18 07:27:39 +0000
commit264eeffd0294d27fd1329a27c84c8b61e5fb0993 (patch)
treeecdf24a2ac2e94ff4606b015573ab24930e847a1 /OpenSim/Region/Environment/Scenes/Scene.cs
parentMegapatch. :) Fix skull attachment editing. Streamline Object terse updates. (diff)
downloadopensim-SC_OLD-264eeffd0294d27fd1329a27c84c8b61e5fb0993.zip
opensim-SC_OLD-264eeffd0294d27fd1329a27c84c8b61e5fb0993.tar.gz
opensim-SC_OLD-264eeffd0294d27fd1329a27c84c8b61e5fb0993.tar.bz2
opensim-SC_OLD-264eeffd0294d27fd1329a27c84c8b61e5fb0993.tar.xz
Fix thingd so that autoreturn also works when the user is not in the sim.
Also add experimental distance ordering for prims
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 139281d..50d0a72 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3385,6 +3385,12 @@ namespace OpenSim.Region.Environment.Scenes
3385 // User needs to be logged into this sim 3385 // User needs to be logged into this sim
3386 if (m_scenePresences.ContainsKey(agentID)) 3386 if (m_scenePresences.ContainsKey(agentID))
3387 { 3387 {
3388 if (godLike == false)
3389 {
3390 m_scenePresences[agentID].GrantGodlikePowers(agentID, sessionID, token, godLike);
3391 return;
3392 }
3393
3388 // First check that this is the sim owner 3394 // First check that this is the sim owner
3389 if (ExternalChecks.ExternalChecksCanBeGodLike(agentID)) 3395 if (ExternalChecks.ExternalChecksCanBeGodLike(agentID))
3390 { 3396 {