aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.Region/World/Primitive.cs3
-rw-r--r--OpenSim/OpenSim.Region/World/World.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build2
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs2
4 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Primitive.cs
index c800f21..99e349d 100644
--- a/OpenSim/OpenSim.Region/World/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Primitive.cs
@@ -224,7 +224,6 @@ namespace OpenSim.Region
224 public void UpdateTexture(byte[] tex) 224 public void UpdateTexture(byte[] tex)
225 { 225 {
226 this.primData.Texture = tex; 226 this.primData.Texture = tex;
227 //this.dirtyFlag = true;
228 } 227 }
229 228
230 /// <summary> 229 /// <summary>
@@ -387,8 +386,6 @@ namespace OpenSim.Region
387 lPos = this.Pos; 386 lPos = this.Pos;
388 lRot = this.rotation; 387 lRot = this.rotation;
389 } 388 }
390
391
392 } 389 }
393 390
394 /// <summary> 391 /// <summary>
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs
index 49ba8fa..cf0382a 100644
--- a/OpenSim/OpenSim.Region/World/World.cs
+++ b/OpenSim/OpenSim.Region/World/World.cs
@@ -544,7 +544,7 @@ namespace OpenSim.Region
544 protected void InformClientOfNeighbours(IClientAPI remoteClient) 544 protected void InformClientOfNeighbours(IClientAPI remoteClient)
545 { 545 {
546 // Console.WriteLine("informing client of neighbouring regions"); 546 // Console.WriteLine("informing client of neighbouring regions");
547 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); 547 List<RegionInfo> neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo);
548 548
549 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); 549 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
550 if (neighbours != null) 550 if (neighbours != null)
@@ -617,7 +617,7 @@ namespace OpenSim.Region
617 /// </summary> 617 /// </summary>
618 public void RegisterRegionWithComms() 618 public void RegisterRegionWithComms()
619 { 619 {
620 this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo); 620 this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo);
621 if (this.regionCommsHost != null) 621 if (this.regionCommsHost != null)
622 { 622 {
623 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); 623 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 8384407..f19da49 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -12,8 +12,6 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="AuthenticateSessionsLocal.cs" />
16 <include name="AuthenticateSessionsRemote.cs" />
17 <include name="ClientView.API.cs" /> 15 <include name="ClientView.API.cs" />
18 <include name="ClientView.cs" /> 16 <include name="ClientView.cs" />
19 <include name="ClientView.Grid.cs" /> 17 <include name="ClientView.Grid.cs" />
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index bd07c8f..489a949 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -131,7 +131,7 @@ namespace OpenSim
131 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); 131 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
132 loginServer.Startup(); 132 loginServer.Startup();
133 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession); 133 //loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);
134 loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).AddNewSession); 134 loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).SandManager.AddNewSession);
135 //sandbox mode with loginserver not using accounts 135 //sandbox mode with loginserver not using accounts
136 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); 136 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
137 } 137 }