aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-05-02 16:41:08 +0000
committerAdam Frisby2008-05-02 16:41:08 +0000
commit29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71 (patch)
tree848ce119d9b87bc186c20b08cc604de50a872b31 /OpenSim/Region/ClientStack/RegionApplicationBase.cs
parent* Refactored ClientView into LLClientView. Removed all direct references to U... (diff)
downloadopensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.zip
opensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.gz
opensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.bz2
opensim-SC_OLD-29b8c84ceaaeca80bfa9c0bfc8c31e421e39ef71.tar.xz
* Commit 2/3 - Please dont attempt to update to this revision until all 3 are in.
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index becf7ba..1102fb4 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -34,12 +34,11 @@ using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Region.ClientStack.LindenUDP;
37using OpenSim.Region.Environment; 38using OpenSim.Region.Environment;
38using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
39using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.Physics.Manager;
40 41
41//using OpenSim.Framework.Console;
42
43namespace OpenSim.Region.ClientStack 42namespace OpenSim.Region.ClientStack
44{ 43{
45 public abstract class RegionApplicationBase : BaseOpenSimServer 44 public abstract class RegionApplicationBase : BaseOpenSimServer
@@ -75,7 +74,7 @@ namespace OpenSim.Region.ClientStack
75 74
76 public virtual void StartUp() 75 public virtual void StartUp()
77 { 76 {
78 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 77 LLClientView.TerrainManager = new TerrainManager(new SecondLife());
79 78
80 m_storageManager = CreateStorageManager(m_storageConnectionString); 79 m_storageManager = CreateStorageManager(m_storageConnectionString);
81 80
@@ -108,12 +107,12 @@ namespace OpenSim.Region.ClientStack
108 return physicsPluginManager.GetPhysicsScene(engine, meshEngine); 107 return physicsPluginManager.GetPhysicsScene(engine, meshEngine);
109 } 108 }
110 109
111 protected Scene SetupScene(RegionInfo regionInfo, out UDPServer udpServer, bool m_permissions) 110 protected Scene SetupScene(RegionInfo regionInfo, out LLUDPServer udpServer, bool m_permissions)
112 { 111 {
113 return SetupScene(regionInfo, 0, out udpServer, m_permissions); 112 return SetupScene(regionInfo, 0, out udpServer, m_permissions);
114 } 113 }
115 114
116 protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out UDPServer udpServer, bool m_permissions) 115 protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out LLUDPServer udpServer, bool m_permissions)
117 { 116 {
118 AgentCircuitManager circuitManager = new AgentCircuitManager(); 117 AgentCircuitManager circuitManager = new AgentCircuitManager();
119 IPAddress listenIP = regionInfo.InternalEndPoint.Address; 118 IPAddress listenIP = regionInfo.InternalEndPoint.Address;
@@ -121,7 +120,7 @@ namespace OpenSim.Region.ClientStack
121 // listenIP = IPAddress.Parse("0.0.0.0"); 120 // listenIP = IPAddress.Parse("0.0.0.0");
122 121
123 uint port = (uint) regionInfo.InternalEndPoint.Port; 122 uint port = (uint) regionInfo.InternalEndPoint.Port;
124 udpServer = new UDPServer(listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, m_assetCache, circuitManager); 123 udpServer = new LLUDPServer(listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, m_assetCache, circuitManager);
125 regionInfo.InternalEndPoint.Port = (int)port; 124 regionInfo.InternalEndPoint.Port = (int)port;
126 125
127 Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); 126 Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager);
@@ -131,8 +130,8 @@ namespace OpenSim.Region.ClientStack
131 scene.LoadWorldMap(); 130 scene.LoadWorldMap();
132 131
133 //moved to opensimMain as these have to happen after modules are initialised 132 //moved to opensimMain as these have to happen after modules are initialised
134 // scene.CreateTerrainTexture(true); 133 // scene.CreateTerrainTexture(true);
135 // scene.RegisterRegionWithGrid(); 134 // scene.RegisterRegionWithGrid();
136 135
137 scene.PhysicsScene = GetPhysicsScene(); 136 scene.PhysicsScene = GetPhysicsScene();
138 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 137 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
@@ -171,4 +170,4 @@ namespace OpenSim.Region.ClientStack
171 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 170 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
172 AgentCircuitManager circuitManager); 171 AgentCircuitManager circuitManager);
173 } 172 }
174} 173} \ No newline at end of file