aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:55:01 +0100
committerMelanie2011-10-25 01:55:01 +0100
commitf50538c81afe4c44e491c867cebb1674b682147b (patch)
treed2e7b8e9e4eb7cb41217265ad25da6153d477b79 /OpenSim
parentMerge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge (diff)
parentfetch physical_prim switch from [Startup] config from inside scene, as is don... (diff)
downloadopensim-SC_OLD-f50538c81afe4c44e491c867cebb1674b682147b.zip
opensim-SC_OLD-f50538c81afe4c44e491c867cebb1674b682147b.tar.gz
opensim-SC_OLD-f50538c81afe4c44e491c867cebb1674b682147b.tar.bz2
opensim-SC_OLD-f50538c81afe4c44e491c867cebb1674b682147b.tar.xz
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs7
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs41
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs4
7 files changed, 24 insertions, 45 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 6ee7fee..2768f70 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -35,12 +35,9 @@ namespace OpenSim.Framework
35 public string StorageDll { get; set; } 35 public string StorageDll { get; set; }
36 public string ClientstackDll { get; set; } 36 public string ClientstackDll { get; set; }
37 37
38 /// <summary> 38
39 /// Controls whether physics can be applied to prims. Even if false, prims still have entries in a
40 /// PhysicsScene in order to perform collision detection
41 /// </summary>
42 public bool PhysicalPrim { get; set; } 39 public bool PhysicalPrim { get; set; }
43 40
44 public string LibrariesXMLFile { get; set; } 41 public string LibrariesXMLFile { get; set; }
45 42
46 public const uint DefaultRegionHttpPort = 9000; 43 public const uint DefaultRegionHttpPort = 9000;
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index d19852b..b496108 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -362,7 +362,6 @@ namespace OpenSim
362 { 362 {
363 m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); 363 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
364 m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 364 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
365 m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true);
366 365
367 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); 366 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
368 367
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 5918843..73b60dd 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -742,7 +742,7 @@ namespace OpenSim
742 742
743 return new Scene( 743 return new Scene(
744 regionInfo, circuitManager, sceneGridService, 744 regionInfo, circuitManager, sceneGridService,
745 simDataService, estateDataService, m_moduleLoader, false, m_configSettings.PhysicalPrim, 745 simDataService, estateDataService, m_moduleLoader, false,
746 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 746 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
747 } 747 }
748 748
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 03b5d36..4d8a759 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -73,8 +73,12 @@ namespace OpenSim.Region.Framework.Scenes
73 public List<Border> SouthBorders = new List<Border>(); 73 public List<Border> SouthBorders = new List<Border>();
74 public List<Border> WestBorders = new List<Border>(); 74 public List<Border> WestBorders = new List<Border>();
75 75
76 /// <summary>Are we applying physics to any of the prims in this scene?</summary> 76 /// <summary>
77 /// Controls whether physics can be applied to prims. Even if false, prims still have entries in a
78 /// PhysicsScene in order to perform collision detection
79 /// </summary>
77 public bool m_physicalPrim; 80 public bool m_physicalPrim;
81
78 public float m_maxNonphys = 256; 82 public float m_maxNonphys = 256;
79 public float m_maxPhys = 10; 83 public float m_maxPhys = 10;
80 public bool m_clampPrimSize; 84 public bool m_clampPrimSize;
@@ -552,7 +556,7 @@ namespace OpenSim.Region.Framework.Scenes
552 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 556 public Scene(RegionInfo regInfo, AgentCircuitManager authen,
553 SceneCommunicationService sceneGridService, 557 SceneCommunicationService sceneGridService,
554 ISimulationDataService simDataService, IEstateDataService estateDataService, 558 ISimulationDataService simDataService, IEstateDataService estateDataService,
555 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 559 ModuleLoader moduleLoader, bool dumpAssetsToFile,
556 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 560 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
557 : this(regInfo) 561 : this(regInfo)
558 { 562 {
@@ -574,6 +578,7 @@ namespace OpenSim.Region.Framework.Scenes
574 m_lastOutgoing = 0; 578 m_lastOutgoing = 0;
575 579
576 m_physicalPrim = physicalPrim; 580 m_physicalPrim = physicalPrim;
581
577 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; 582 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
578 583
579 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 584 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
@@ -697,6 +702,9 @@ namespace OpenSim.Region.Framework.Scenes
697 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); 702 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
698 // TODO: Change default to true once the feature is supported 703 // TODO: Change default to true once the feature is supported
699 m_usePreJump = startupConfig.GetBoolean("enableprejump", true); 704 m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
705
706 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
707
700 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 708 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
701 709
702 m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF"); 710 m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 92db8b0..d7435c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -130,20 +130,15 @@ namespace OpenSim.Region.Framework.Scenes
130 #region Fields 130 #region Fields
131 131
132 public bool AllowedDrop; 132 public bool AllowedDrop;
133
134 133
135 public bool DIE_AT_EDGE; 134 public bool DIE_AT_EDGE;
136
137 135
138 public bool RETURN_AT_EDGE; 136 public bool RETURN_AT_EDGE;
139
140 137
141 public bool BlockGrab; 138 public bool BlockGrab;
142 139
143
144 public bool StatusSandbox; 140 public bool StatusSandbox;
145 141
146
147 public Vector3 StatusSandboxPos; 142 public Vector3 StatusSandboxPos;
148 143
149 [XmlIgnore] 144 [XmlIgnore]
@@ -166,29 +161,21 @@ namespace OpenSim.Region.Framework.Scenes
166 // for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script) 161 // for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script)
167 162
168 public UUID Sound; 163 public UUID Sound;
169 164
170
171 public byte SoundFlags; 165 public byte SoundFlags;
172 166
173
174 public double SoundGain; 167 public double SoundGain;
175 168
176
177 public double SoundRadius; 169 public double SoundRadius;
178 170
179
180 public uint TimeStampFull; 171 public uint TimeStampFull;
181 172
182
183 public uint TimeStampLastActivity; // Will be used for AutoReturn 173 public uint TimeStampLastActivity; // Will be used for AutoReturn
184
185
186 public uint TimeStampTerse;
187 174
175 public uint TimeStampTerse;
188 176
189 public UUID FromItemID; 177 public UUID FromItemID;
190 178
191
192 public UUID FromFolderID; 179 public UUID FromFolderID;
193 180
194 // The following two are to hold the attachment data 181 // The following two are to hold the attachment data
@@ -202,13 +189,10 @@ namespace OpenSim.Region.Framework.Scenes
202 [XmlIgnore] 189 [XmlIgnore]
203 public int STATUS_ROTATE_X; 190 public int STATUS_ROTATE_X;
204 191
205
206 public int STATUS_ROTATE_Y; 192 public int STATUS_ROTATE_Y;
207 193
208
209 public int STATUS_ROTATE_Z; 194 public int STATUS_ROTATE_Z;
210 195
211
212 private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>(); 196 private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
213 197
214 /// <value> 198 /// <value>
@@ -225,35 +209,26 @@ namespace OpenSim.Region.Framework.Scenes
225 209
226 public scriptEvents AggregateScriptEvents; 210 public scriptEvents AggregateScriptEvents;
227 211
228
229 public Vector3 AttachedPos; 212 public Vector3 AttachedPos;
230 213
231
232 public Vector3 RotationAxis = Vector3.One; 214 public Vector3 RotationAxis = Vector3.One;
233 215
234
235 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this 216 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this
236 // Certainly this must be a persistant setting finally 217 // Certainly this must be a persistant setting finally
237 218
238
239 public bool IsWaitingForFirstSpinUpdatePacket; 219 public bool IsWaitingForFirstSpinUpdatePacket;
240 220
241
242 public Quaternion SpinOldOrientation = Quaternion.Identity; 221 public Quaternion SpinOldOrientation = Quaternion.Identity;
243 222
244
245 public Quaternion m_APIDTarget = Quaternion.Identity; 223 public Quaternion m_APIDTarget = Quaternion.Identity;
246 224
247
248 public float m_APIDDamp = 0; 225 public float m_APIDDamp = 0;
249
250 226
251 public float m_APIDStrength = 0; 227 public float m_APIDStrength = 0;
252 228
253 /// <summary> 229 /// <summary>
254 /// This part's inventory 230 /// This part's inventory
255 /// </summary> 231 /// </summary>
256
257 public IEntityInventory Inventory 232 public IEntityInventory Inventory
258 { 233 {
259 get { return m_inventory; } 234 get { return m_inventory; }
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index ea433a6..c64270f 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Tests.Common
108 IConfigSource configSource = new IniConfigSource(); 108 IConfigSource configSource = new IniConfigSource();
109 109
110 TestScene testScene = new TestScene( 110 TestScene testScene = new TestScene(
111 regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null); 111 regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null);
112 112
113 IRegionModule godsModule = new GodsModule(); 113 IRegionModule godsModule = new GodsModule();
114 godsModule.Initialise(testScene, new IniConfigSource()); 114 godsModule.Initialise(testScene, new IniConfigSource());
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 0e1433a..f0e65c5 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,10 +41,10 @@ namespace OpenSim.Tests.Common.Mock
41 public TestScene( 41 public TestScene(
42 RegionInfo regInfo, AgentCircuitManager authen, 42 RegionInfo regInfo, AgentCircuitManager authen,
43 SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, 43 SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
44 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 44 ModuleLoader moduleLoader, bool dumpAssetsToFile,
45 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 45 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
46 : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, 46 : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader,
47 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) 47 dumpAssetsToFile, SeeIntoRegionFromNeighbor, config, simulatorVersion)
48 { 48 {
49 } 49 }
50 50