aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-29 01:21:15 +0100
committerJustin Clark-Casey (justincc)2014-07-29 01:21:15 +0100
commit3654ae8d8cea0bf0455974efe18ff99e484d2893 (patch)
tree4daebd94efd967de9d64f69ace7d057f514635e6 /OpenSim/Region/CoreModules/ServiceConnectorsOut
parentminor: make "debug scene set" usage command accurate again from last commit f... (diff)
downloadopensim-SC-3654ae8d8cea0bf0455974efe18ff99e484d2893.zip
opensim-SC-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.gz
opensim-SC-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.bz2
opensim-SC-3654ae8d8cea0bf0455974efe18ff99e484d2893.tar.xz
Allow the "debug scene set physics false|true" command to work when bulletsim physics is running in a separate thread.
This will also allow the "disable physics" setting in the region debug viewer dialog to work in this circumstance.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 25ae689..aa5f889 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
85 r1.ExternalHostName = "127.0.0.1"; 85 r1.ExternalHostName = "127.0.0.1";
86 r1.HttpPort = 9001; 86 r1.HttpPort = 9001;
87 r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); 87 r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
88 Scene s = new Scene(new RegionInfo()); 88 Scene s = new Scene(new RegionInfo(), null);
89 s.RegionInfo.RegionID = r1.RegionID; 89 s.RegionInfo.RegionID = r1.RegionID;
90 m_LocalConnector.AddRegion(s); 90 m_LocalConnector.AddRegion(s);
91 91
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
97 r2.ExternalHostName = "127.0.0.1"; 97 r2.ExternalHostName = "127.0.0.1";
98 r2.HttpPort = 9002; 98 r2.HttpPort = 9002;
99 r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); 99 r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
100 s = new Scene(new RegionInfo()); 100 s = new Scene(new RegionInfo(), null);
101 s.RegionInfo.RegionID = r2.RegionID; 101 s.RegionInfo.RegionID = r2.RegionID;
102 m_LocalConnector.AddRegion(s); 102 m_LocalConnector.AddRegion(s);
103 103
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
109 r3.ExternalHostName = "127.0.0.1"; 109 r3.ExternalHostName = "127.0.0.1";
110 r3.HttpPort = 9003; 110 r3.HttpPort = 9003;
111 r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); 111 r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
112 s = new Scene(new RegionInfo()); 112 s = new Scene(new RegionInfo(), null);
113 s.RegionInfo.RegionID = r3.RegionID; 113 s.RegionInfo.RegionID = r3.RegionID;
114 m_LocalConnector.AddRegion(s); 114 m_LocalConnector.AddRegion(s);
115 115
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
121 r4.ExternalHostName = "127.0.0.1"; 121 r4.ExternalHostName = "127.0.0.1";
122 r4.HttpPort = 9004; 122 r4.HttpPort = 9004;
123 r4.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); 123 r4.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
124 s = new Scene(new RegionInfo()); 124 s = new Scene(new RegionInfo(), null);
125 s.RegionInfo.RegionID = r4.RegionID; 125 s.RegionInfo.RegionID = r4.RegionID;
126 m_LocalConnector.AddRegion(s); 126 m_LocalConnector.AddRegion(s);
127 127