aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 05:43:21 +0000
committerTeravus Ovares2008-05-14 05:43:21 +0000
commit39eb39c0d5a86ef2f4cb3375be86eb978b03d2e9 (patch)
tree620a8e288a0ad009033e3c20d60328fe17729ef9 /OpenSim/Region
parentMore formatting cleanup. (diff)
downloadopensim-SC_OLD-39eb39c0d5a86ef2f4cb3375be86eb978b03d2e9.zip
opensim-SC_OLD-39eb39c0d5a86ef2f4cb3375be86eb978b03d2e9.tar.gz
opensim-SC_OLD-39eb39c0d5a86ef2f4cb3375be86eb978b03d2e9.tar.bz2
opensim-SC_OLD-39eb39c0d5a86ef2f4cb3375be86eb978b03d2e9.tar.xz
Applied Patch mantis 1220. Implements llGetStartParameter. Thanks!
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
3 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 82a6b94..62ad2cd 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1406,6 +1406,9 @@ namespace OpenSim.Region.Environment.Scenes
1406 group.ResetIDs(); 1406 group.ResetIDs();
1407 AddEntity(group); 1407 AddEntity(group);
1408 1408
1409 // Set the startup parameter for on_rez event and llGetStartParameter() function
1410 group.StartParameter = param;
1411
1409 // we set it's position in world. 1412 // we set it's position in world.
1410 group.AbsolutePosition = pos; 1413 group.AbsolutePosition = pos;
1411 1414
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 3844793..bc99aa4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.IO; 31using System.IO;
32using System.Xml; 32using System.Xml;
33using System.Xml.Serialization;
33using Axiom.Math; 34using Axiom.Math;
34using libsecondlife; 35using libsecondlife;
35using libsecondlife.Packets; 36using libsecondlife.Packets;
@@ -109,6 +110,7 @@ namespace OpenSim.Region.Environment.Scenes
109 private bool m_scriptListens_atTarget = false; 110 private bool m_scriptListens_atTarget = false;
110 private bool m_scriptListens_notAtTarget = false; 111 private bool m_scriptListens_notAtTarget = false;
111 112
113 private int m_startparameter = 0;
112 114
113 #region Properties 115 #region Properties
114 116
@@ -122,6 +124,16 @@ namespace OpenSim.Region.Environment.Scenes
122 protected bool m_isSelected = false; 124 protected bool m_isSelected = false;
123 125
124 /// <summary> 126 /// <summary>
127 /// Set start parameter for on_rez event and llGetStartParameter()
128 /// </summary>
129 [XmlIgnore]
130 public int StartParameter
131 {
132 get { return m_startparameter; }
133 set { m_startparameter = value; }
134 }
135
136 /// <summary>
125 /// 137 ///
126 /// </summary> 138 /// </summary>
127 public int PrimCount 139 public int PrimCount
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 61b577e..a061788 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2202,8 +2202,8 @@ namespace OpenSim.Region.ScriptEngine.Common
2202 public LSL_Types.LSLInteger llGetStartParameter() 2202 public LSL_Types.LSLInteger llGetStartParameter()
2203 { 2203 {
2204 m_host.AddScriptLPS(1); 2204 m_host.AddScriptLPS(1);
2205 NotImplemented("llGetStartParameter"); 2205 // NotImplemented("llGetStartParameter");
2206 return 0; 2206 return m_host.ParentGroup.StartParameter;
2207 } 2207 }
2208 2208
2209 public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos) 2209 public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos)