aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-27 05:37:48 +0000
committerTeravus Ovares2007-12-27 05:37:48 +0000
commitcbf5ff4a9371c067dbe36ef28487c8784b9229d2 (patch)
treea5b16f0cd840374dc475153d77671f1d20f06ac7 /OpenSim/Region/Environment/Scenes
parent* Added osRegionRestart(float secs) to LSL Commands (diff)
downloadopensim-SC-cbf5ff4a9371c067dbe36ef28487c8784b9229d2.zip
opensim-SC-cbf5ff4a9371c067dbe36ef28487c8784b9229d2.tar.gz
opensim-SC-cbf5ff4a9371c067dbe36ef28487c8784b9229d2.tar.bz2
opensim-SC-cbf5ff4a9371c067dbe36ef28487c8784b9229d2.tar.xz
* Added Sit Target persistence over sim restarts for mySQL and MonoSQLite.
* SAVE YOUR PRIM DATA, THIS MAKES CHANGES TO YOUR PRIMS TABLE * The first time you run OpenSim after updating past this revision, you'll see a lot of Errors. Be calm, shutdown the simulator, and start it again and your prims table will be updated. * MSSQL added the fields to the Initial CreateTable section, however, you'll need to add the fields to your prims table if you want it to persist.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs27
1 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index bcd31c2..973c30e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -72,6 +72,8 @@ namespace OpenSim.Region.Environment.Scenes
72 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1); 72 private Quaternion m_sitTargetOrientation = new Quaternion(0, 0, 0, 1);
73 private LLUUID m_SitTargetAvatar = LLUUID.Zero; 73 private LLUUID m_SitTargetAvatar = LLUUID.Zero;
74 74
75
76
75 77
76 // Main grid has default permissions as follows 78 // Main grid has default permissions as follows
77 // 79 //
@@ -345,6 +347,15 @@ namespace OpenSim.Region.Environment.Scenes
345 347
346 private string m_text = ""; 348 private string m_text = "";
347 349
350 public Vector3 SitTargetPosition
351 {
352 get { return m_sitTargetPosition; }
353 }
354 public Quaternion SitTargetOrientation
355 {
356 get { return m_sitTargetOrientation; }
357 }
358
348 public string Text 359 public string Text
349 { 360 {
350 get { return m_text; } 361 get { return m_text; }
@@ -786,6 +797,22 @@ namespace OpenSim.Region.Environment.Scenes
786 m_sitTargetPosition = offset; 797 m_sitTargetPosition = offset;
787 m_sitTargetOrientation = orientation; 798 m_sitTargetOrientation = orientation;
788 } 799 }
800 public LLVector3 GetSitTargetPositionLL()
801 {
802 return new LLVector3(m_sitTargetPosition.x, m_sitTargetPosition.y, m_sitTargetPosition.z);
803 }
804
805 public LLQuaternion GetSitTargetOrientationLL()
806 {
807 return new LLQuaternion(m_sitTargetOrientation.w, m_sitTargetOrientation.x, m_sitTargetOrientation.y, m_sitTargetOrientation.z);
808 }
809
810 // Utility function so the databases don't have to reference axiom.math
811 public void SetSitTargetLL(LLVector3 offset, LLQuaternion orientation)
812 {
813 m_sitTargetPosition = new Vector3(offset.X, offset.Y, offset.Z);
814 m_sitTargetOrientation = new Quaternion(orientation.W, orientation.X, orientation.Y, orientation.Z);
815 }
789 816
790 public Vector3 GetSitTargetPosition() 817 public Vector3 GetSitTargetPosition()
791 { 818 {