aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs13
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs15
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
-rw-r--r--bin/OpenSim.ini.example3
6 files changed, 24 insertions, 23 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index d28d65a..3df4c8c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -65,7 +65,7 @@ namespace OpenSim
65 public bool m_sandbox; 65 public bool m_sandbox;
66 public bool user_accounts; 66 public bool user_accounts;
67 public bool m_gridLocalAsset; 67 public bool m_gridLocalAsset;
68 public bool m_SendChildAgentTaskData; 68 public bool m_see_into_region_from_neighbor;
69 69
70 protected LocalLoginService m_loginService; 70 protected LocalLoginService m_loginService;
71 71
@@ -167,7 +167,7 @@ namespace OpenSim
167 config.Set("physics", "basicphysics"); 167 config.Set("physics", "basicphysics");
168 config.Set("verbose", true); 168 config.Set("verbose", true);
169 config.Set("physical_prim", true); 169 config.Set("physical_prim", true);
170 config.Set("child_get_tasks", false); 170 config.Set("see_into_this_sim_from_neighbor", true);
171 config.Set("serverside_object_permissions", false); 171 config.Set("serverside_object_permissions", false);
172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); 172 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 173 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
@@ -238,7 +238,7 @@ namespace OpenSim
238 238
239 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); 239 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
240 240
241 m_SendChildAgentTaskData = startupConfig.GetBoolean("child_get_tasks", false); 241 m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
242 242
243 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 243 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
244 244
@@ -490,15 +490,10 @@ namespace OpenSim
490 { 490 {
491 PermissionManager permissionManager = new PermissionManager(); 491 PermissionManager permissionManager = new PermissionManager();
492 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 492 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
493 if (m_SendChildAgentTaskData)
494 {
495 m_log.Error("[WARNING]: Send Child Agent Task Updates is enabled. This is for testing only.");
496 //Thread.Sleep(12000);
497 }
498 return 493 return
499 new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache, 494 new Scene(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, m_assetCache,
500 storageManager, m_httpServer, 495 storageManager, m_httpServer,
501 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_SendChildAgentTaskData); 496 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor);
502 } 497 }
503 498
504 499
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index cb04939..219db63 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -716,7 +716,7 @@ namespace OpenSim.Region.Environment.Scenes
716 // the initial update for and what we'll use to limit the 716 // the initial update for and what we'll use to limit the
717 // space we check for new objects on movement. 717 // space we check for new objects on movement.
718 718
719 if (presence.IsChildAgent && m_parentScene.m_sendTasksToChild) 719 if (presence.IsChildAgent && m_parentScene.m_seeIntoRegionFromNeighbor)
720 { 720 {
721 LLVector3 oLoc = ((SceneObjectGroup)ent).AbsolutePosition; 721 LLVector3 oLoc = ((SceneObjectGroup)ent).AbsolutePosition;
722 float distResult = (float)Util.GetDistanceTo(presence.AbsolutePosition,oLoc); 722 float distResult = (float)Util.GetDistanceTo(presence.AbsolutePosition,oLoc);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 999de9c..88cda40 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Environment.Scenes
77 77
78 private readonly Mutex updateLock; 78 private readonly Mutex updateLock;
79 public bool m_physicalPrim; 79 public bool m_physicalPrim;
80 public bool m_sendTasksToChild; 80 public bool m_seeIntoRegionFromNeighbor;
81 private int m_RestartTimerCounter; 81 private int m_RestartTimerCounter;
82 private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing 82 private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing
83 private int m_incrementsof15seconds = 0; 83 private int m_incrementsof15seconds = 0;
@@ -224,7 +224,7 @@ namespace OpenSim.Region.Environment.Scenes
224 public Scene(RegionInfo regInfo, AgentCircuitManager authen, PermissionManager permissionManager, 224 public Scene(RegionInfo regInfo, AgentCircuitManager authen, PermissionManager permissionManager,
225 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 225 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
226 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 226 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
227 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SendTasksToChild) 227 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor)
228 { 228 {
229 updateLock = new Mutex(false); 229 updateLock = new Mutex(false);
230 230
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Scenes
241 m_datastore = m_regInfo.DataStore; 241 m_datastore = m_regInfo.DataStore;
242 242
243 m_physicalPrim = physicalPrim; 243 m_physicalPrim = physicalPrim;
244 m_sendTasksToChild = SendTasksToChild; 244 m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
245 245
246 m_eventManager = new EventManager(); 246 m_eventManager = new EventManager();
247 247
@@ -317,7 +317,7 @@ namespace OpenSim.Region.Environment.Scenes
317 OSString = OSString.Substring(0, 45); 317 OSString = OSString.Substring(0, 45);
318 } 318 }
319 319
320 m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_sendTasksToChild.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); 320 m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString();
321 } 321 }
322 322
323 #endregion 323 #endregion
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 05b9014..83f0c27 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1726,13 +1726,16 @@ namespace OpenSim.Region.Environment.Scenes
1726 { 1726 {
1727 if (m_parts.Count > 1) 1727 if (m_parts.Count > 1)
1728 { 1728 {
1729 foreach (SceneObjectPart part in m_parts.Values) 1729 lock (m_parts)
1730 { 1730 {
1731 part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim); 1731 foreach (SceneObjectPart part in m_parts.Values)
1732 1732 {
1733 // Hack to get the physics scene geometries in the right spot 1733 part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
1734 ResetChildPrimPhysicsPositions(); 1734
1735 1735 // Hack to get the physics scene geometries in the right spot
1736 ResetChildPrimPhysicsPositions();
1737
1738 }
1736 } 1739 }
1737 } 1740 }
1738 else 1741 else
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 21710c0..8155b10 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Environment.Scenes
428 428
429 if (!m_gotAllObjectsInScene) 429 if (!m_gotAllObjectsInScene)
430 { 430 {
431 if (!m_isChildAgent || m_scene.m_sendTasksToChild) 431 if (!m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor)
432 { 432 {
433 433
434 m_scene.SendAllSceneObjectsToClient(this); 434 m_scene.SendAllSceneObjectsToClient(this);
@@ -1358,7 +1358,7 @@ namespace OpenSim.Region.Environment.Scenes
1358 SendFullUpdateToOtherClient(avatar); 1358 SendFullUpdateToOtherClient(avatar);
1359 if (avatar.LocalId != LocalId) 1359 if (avatar.LocalId != LocalId)
1360 { 1360 {
1361 if (!avatar.m_isChildAgent || m_scene.m_sendTasksToChild) 1361 if (!avatar.m_isChildAgent || m_scene.m_seeIntoRegionFromNeighbor)
1362 { 1362 {
1363 avatar.SendFullUpdateToOtherClient(this); 1363 avatar.SendFullUpdateToOtherClient(this);
1364 avatar.SendAppearanceToOtherAgent(this); 1364 avatar.SendAppearanceToOtherAgent(this);
@@ -1638,7 +1638,7 @@ namespace OpenSim.Region.Environment.Scenes
1638 1638
1639 1639
1640 // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. 1640 // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
1641 if (m_scene.m_sendTasksToChild) 1641 if (m_scene.m_seeIntoRegionFromNeighbor)
1642 m_scene.SendAllSceneObjectsToClient(this); 1642 m_scene.SendAllSceneObjectsToClient(this);
1643 //cAgentData.AVHeight; 1643 //cAgentData.AVHeight;
1644 //cAgentData.regionHandle; 1644 //cAgentData.regionHandle;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f406595..21d236f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -58,6 +58,9 @@ physical_prim = true
58; To run a script every few minutes, set the script filename here 58; To run a script every few minutes, set the script filename here
59; timer_Script = "filename" 59; timer_Script = "filename"
60 60
61; If you would like to see into this region from neighbor simulators
62see_into_this_sim_from_neighbor = true
63
61[StandAlone] 64[StandAlone]
62accounts_authenticate = true 65accounts_authenticate = true
63welcome_message = "Welcome to OpenSim" 66welcome_message = "Welcome to OpenSim"