diff options
author | Charles Krinke | 2008-06-28 16:08:12 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-28 16:08:12 +0000 |
commit | 9a0ef22ed979433f4d017a252173f38fe5e56892 (patch) | |
tree | 98bd25e3a49a38922b37728df4de9e0fa5b7366a /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | plumbing for multiple inventory servers. Mostly done on the region server side. (diff) | |
download | opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.zip opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.gz opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.bz2 opensim-SC_OLD-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.xz |
Mantis#1616. Applied Melanie's patch. This may or may
not break trunk.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 4a24dad..ebefdce 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -114,8 +114,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
114 | private bool m_scriptListens_atTarget = false; | 114 | private bool m_scriptListens_atTarget = false; |
115 | private bool m_scriptListens_notAtTarget = false; | 115 | private bool m_scriptListens_notAtTarget = false; |
116 | 116 | ||
117 | private int m_startparameter = 0; | ||
118 | |||
119 | #region Properties | 117 | #region Properties |
120 | 118 | ||
121 | /// <summary> | 119 | /// <summary> |
@@ -137,16 +135,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
137 | protected bool m_isSelected = false; | 135 | protected bool m_isSelected = false; |
138 | 136 | ||
139 | /// <summary> | 137 | /// <summary> |
140 | /// Set start parameter for on_rez event and llGetStartParameter() | ||
141 | /// </summary> | ||
142 | [XmlIgnore] | ||
143 | public int StartParameter | ||
144 | { | ||
145 | get { return m_startparameter; } | ||
146 | set { m_startparameter = value; } | ||
147 | } | ||
148 | |||
149 | /// <summary> | ||
150 | /// Number of prims in this group | 138 | /// Number of prims in this group |
151 | /// </summary> | 139 | /// </summary> |
152 | public int PrimCount | 140 | public int PrimCount |
@@ -937,7 +925,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
937 | { | 925 | { |
938 | foreach (SceneObjectPart part in m_parts.Values) | 926 | foreach (SceneObjectPart part in m_parts.Values) |
939 | { | 927 | { |
940 | part.StopScripts(); | 928 | part.RemoveScriptInstances(); |
941 | 929 | ||
942 | List<ScenePresence> avatars = Scene.GetScenePresences(); | 930 | List<ScenePresence> avatars = Scene.GetScenePresences(); |
943 | for (int i = 0; i < avatars.Count; i++) | 931 | for (int i = 0; i < avatars.Count; i++) |