aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorCharles Krinke2007-12-24 21:16:32 +0000
committerCharles Krinke2007-12-24 21:16:32 +0000
commitfa2495ae6b39b8b1f98bed221d4d2660724018de (patch)
treeb6f98251c94e6200de44b66c814187ec4953eb2f /OpenSim/Region/Environment/Scenes
parentRevert most of the regionName message stuff. (diff)
downloadopensim-SC_OLD-fa2495ae6b39b8b1f98bed221d4d2660724018de.zip
opensim-SC_OLD-fa2495ae6b39b8b1f98bed221d4d2660724018de.tar.gz
opensim-SC_OLD-fa2495ae6b39b8b1f98bed221d4d2660724018de.tar.bz2
opensim-SC_OLD-fa2495ae6b39b8b1f98bed221d4d2660724018de.tar.xz
Again, great thanks to Alondria for:
Adding:: llSetParcelMusicUrl(), llGetRootPosition(), llGetRootRotation(), llGetGeometricCenter(), llSetLocalRot(), llListReplaceList(), llGetObjectPrimCount(),llGetParcelDetails(), llGetParcelMaxPrims(), llWater(), llGetLocalRot(), and llGetAccel()
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs21
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs14
2 files changed, 33 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 117cbd5..cf17686 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1981,7 +1981,26 @@ namespace OpenSim.Region.Environment.Scenes
1981 return land.landData.ownerID; 1981 return land.landData.ownerID;
1982 } 1982 }
1983 } 1983 }
1984 1984
1985 public LandData GetLandData(float x, float y)
1986 {
1987 return LandManager.getLandObject(x, y).landData;
1988 }
1989
1990 public void SetLandMusicURL(float x, float y, string url)
1991 {
1992 Land land = LandManager.getLandObject(x, y);
1993 if (land == null)
1994 {
1995 return;
1996 }
1997 else
1998 {
1999 land.landData.musicURL = url;
2000 return;
2001 }
2002 }
2003
1985 #endregion 2004 #endregion
1986 2005
1987 #region Script Engine 2006 #region Script Engine
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 66fc53c..cbb50d7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -543,7 +543,7 @@ namespace OpenSim.Region.Environment.Scenes
543 bool isPhantom = ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) != 0); 543 bool isPhantom = ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) != 0);
544 544
545 bool usePhysics = isPhysical && !isPhantom; 545 bool usePhysics = isPhysical && !isPhantom;
546 546
547 if (usePhysics) 547 if (usePhysics)
548 { 548 {
549 PhysActor = m_parentGroup.m_scene.PhysicsScene.AddPrimShape( 549 PhysActor = m_parentGroup.m_scene.PhysicsScene.AddPrimShape(
@@ -1239,6 +1239,18 @@ namespace OpenSim.Region.Environment.Scenes
1239 } 1239 }
1240 } 1240 }
1241 1241
1242 public LLVector3 GetGeometricCenter()
1243 {
1244 if (PhysActor != null)
1245 {
1246 return new LLVector3(PhysActor.CenterOfMass.X,PhysActor.CenterOfMass.Y,PhysActor.CenterOfMass.Z);
1247 }
1248 else
1249 {
1250 return new LLVector3(0, 0, 0);
1251 }
1252 }
1253
1242 #endregion 1254 #endregion
1243 1255
1244 #region Texture 1256 #region Texture