aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-10-14 23:31:38 +0100
committerMelanie2009-10-14 23:31:38 +0100
commit6bdd6ae0a0ec60dfe1e0646d62c52348a967f444 (patch)
treef244ae59274d787bb20ac87bf181de078a3d1e55 /OpenSim/Region
parent* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow m... (diff)
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.zip
opensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.tar.gz
opensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.tar.bz2
opensim-SC_OLD-6bdd6ae0a0ec60dfe1e0646d62c52348a967f444.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9f14761..14e4534 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1796,6 +1796,7 @@ namespace OpenSim.Region.Framework.Scenes
1796 if (crossedBordery.BorderLine.Z > 0) 1796 if (crossedBordery.BorderLine.Z > 0)
1797 { 1797 {
1798 pos.Y = ((pos.Y + crossedBordery.BorderLine.Z)); 1798 pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
1799 changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
1799 } 1800 }
1800 else 1801 else
1801 pos.Y = ((pos.Y + Constants.RegionSize)); 1802 pos.Y = ((pos.Y + Constants.RegionSize));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b5f6721..e10e612 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -859,7 +859,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
859 World.Entities.TryGetValue(objecUUID, out SensedObject); 859 World.Entities.TryGetValue(objecUUID, out SensedObject);
860 860
861 if (SensedObject == null) 861 if (SensedObject == null)
862 {
863 IGroupsModule groups = World.RequestModuleInterface<IGroupsModule>();
864 if (groups != null)
865 {
866 GroupRecord gr = groups.GetGroupRecord(objecUUID);
867 if (gr != null)
868 return gr.GroupName;
869 }
862 return String.Empty; 870 return String.Empty;
871 }
872
863 return SensedObject.Name; 873 return SensedObject.Name;
864 } 874 }
865 875