diff options
author | lbsa71 | 2007-06-09 21:45:58 +0000 |
---|---|---|
committer | lbsa71 | 2007-06-09 21:45:58 +0000 |
commit | 4224b695acc2e1ad0199dc0ad7f560494182ed54 (patch) | |
tree | 8fae1cf25a058bc4e378ef2b6ce264d7f9f0b910 /OpenSim/OpenSim.RegionServer | |
parent | *Fixed casting mishap in last commit - client now starts up without crashing (diff) | |
download | opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.zip opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.gz opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.bz2 opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.xz |
* LogFile now defaults to "{apptype}.log"
* cleaned away suo and user files.
* added handy string chat variety to the API
* Moved LockPhysicsEngine on World to SyncRoot on IWorld
* Introduced NextLocalId instead of World fuggliness.
* Transformed GetRegionInfo to Property on IWorld for great justice
* Extracted default wearables (good to have)
* Deleted unused BaseServer
* Used IWorld instead of World wherever possible
* The client constructor's not getting unused port any longer.
* Extracted ClientView factoring so PacketServer can be tweaked.
* Added SendLayerData to World
* Made WorldBase abstract and cleaned it up a bit
* added OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to svn
* Added code for two examples (but not in prebuild yet)
Diffstat (limited to '')
7 files changed, 54 insertions, 49 deletions
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs index 91772f8..4db7ccb 100644 --- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs +++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs | |||
@@ -13,7 +13,13 @@ namespace OpenSim | |||
13 | { | 13 | { |
14 | 14 | ||
15 | } | 15 | } |
16 | 16 | ||
17 | public bool AddNewSessionHandler(ulong regionHandle, Login loginData) | ||
18 | { | ||
19 | AddNewSession( loginData ); | ||
20 | return true; | ||
21 | } | ||
22 | |||
17 | public void AddNewSession(Login loginData) | 23 | public void AddNewSession(Login loginData) |
18 | { | 24 | { |
19 | AgentCircuitData agent = new AgentCircuitData(); | 25 | AgentCircuitData agent = new AgentCircuitData(); |
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index 9e0cd48..37e27f8 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs | |||
@@ -153,6 +153,11 @@ namespace OpenSim | |||
153 | OutPacket(mov); | 153 | OutPacket(mov); |
154 | } | 154 | } |
155 | 155 | ||
156 | public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) | ||
157 | { | ||
158 | SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID); | ||
159 | } | ||
160 | |||
156 | /// <summary> | 161 | /// <summary> |
157 | /// | 162 | /// |
158 | /// </summary> | 163 | /// </summary> |
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index d970162..f9a7fe4 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim | |||
70 | private AgentAssetUpload UploadAssets; | 70 | private AgentAssetUpload UploadAssets; |
71 | private LLUUID newAssetFolder = LLUUID.Zero; | 71 | private LLUUID newAssetFolder = LLUUID.Zero; |
72 | private bool debug = false; | 72 | private bool debug = false; |
73 | private IWorld m_world; | 73 | protected IWorld m_world; |
74 | private Dictionary<uint, ClientView> m_clientThreads; | 74 | private Dictionary<uint, ClientView> m_clientThreads; |
75 | private AssetCache m_assetCache; | 75 | private AssetCache m_assetCache; |
76 | private IGridServer m_gridServer; | 76 | private IGridServer m_gridServer; |
@@ -78,11 +78,9 @@ namespace OpenSim | |||
78 | private int cachedtextureserial = 0; | 78 | private int cachedtextureserial = 0; |
79 | private RegionInfo m_regionData; | 79 | private RegionInfo m_regionData; |
80 | protected AuthenticateSessionsBase m_authenticateSessionsHandler; | 80 | protected AuthenticateSessionsBase m_authenticateSessionsHandler; |
81 | protected uint serverPort = 0; | ||
82 | 81 | ||
83 | public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port) | 82 | public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions ) |
84 | { | 83 | { |
85 | this.serverPort = port; | ||
86 | m_world = world; | 84 | m_world = world; |
87 | m_clientThreads = clientThreads; | 85 | m_clientThreads = clientThreads; |
88 | m_assetCache = assetCache; | 86 | m_assetCache = assetCache; |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 2fc6516..990b5c3 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -124,10 +124,7 @@ | |||
124 | </ProjectReference> | 124 | </ProjectReference> |
125 | </ItemGroup> | 125 | </ItemGroup> |
126 | <ItemGroup> | 126 | <ItemGroup> |
127 | <Compile Include="NetworkServersInfo.cs"> | 127 | <Compile Include="AgentAssetUpload.cs"> |
128 | <SubType>Code</SubType> | ||
129 | </Compile> | ||
130 | <Compile Include="UDPServer.cs"> | ||
131 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
132 | </Compile> | 129 | </Compile> |
133 | <Compile Include="AuthenticateSessionsLocal.cs"> | 130 | <Compile Include="AuthenticateSessionsLocal.cs"> |
@@ -136,52 +133,55 @@ | |||
136 | <Compile Include="AuthenticateSessionsRemote.cs"> | 133 | <Compile Include="AuthenticateSessionsRemote.cs"> |
137 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
138 | </Compile> | 135 | </Compile> |
139 | <Compile Include="OpenSimNetworkHandler.cs"> | 136 | <Compile Include="ClientView.API.cs"> |
140 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
141 | </Compile> | 138 | </Compile> |
142 | <Compile Include="UserConfigUtility.cs"> | 139 | <Compile Include="ClientView.cs"> |
143 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
144 | </Compile> | 141 | </Compile> |
145 | <Compile Include="ClientView.Grid.cs"> | 142 | <Compile Include="ClientView.Grid.cs"> |
146 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
147 | </Compile> | 144 | </Compile> |
148 | <Compile Include="PacketServer.cs"> | 145 | <Compile Include="ClientView.PacketHandlers.cs"> |
149 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
150 | </Compile> | 147 | </Compile> |
151 | <Compile Include="ClientView.PacketHandlers.cs"> | 148 | <Compile Include="ClientView.ProcessPackets.cs"> |
152 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
153 | </Compile> | 150 | </Compile> |
154 | <Compile Include="VersionInfo.cs"> | 151 | <Compile Include="ClientViewBase.cs"> |
155 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
156 | </Compile> | 153 | </Compile> |
157 | <Compile Include="AgentAssetUpload.cs"> | 154 | <Compile Include="CommsManager.cs"> |
158 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
159 | </Compile> | 156 | </Compile> |
160 | <Compile Include="ClientViewBase.cs"> | 157 | <Compile Include="NetworkServersInfo.cs"> |
161 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
162 | </Compile> | 159 | </Compile> |
163 | <Compile Include="RegionServerBase.cs"> | 160 | <Compile Include="OpenSimNetworkHandler.cs"> |
164 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
165 | </Compile> | 162 | </Compile> |
166 | <Compile Include="CommsManager.cs"> | 163 | <Compile Include="PacketServer.cs"> |
167 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
168 | </Compile> | 165 | </Compile> |
169 | <Compile Include="ClientView.cs"> | 166 | <Compile Include="RegionServerBase.cs"> |
170 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
171 | </Compile> | 168 | </Compile> |
172 | <Compile Include="ClientView.API.cs"> | 169 | <Compile Include="UDPServer.cs"> |
173 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
174 | </Compile> | 171 | </Compile> |
175 | <Compile Include="ClientView.ProcessPackets.cs"> | 172 | <Compile Include="UserConfigUtility.cs"> |
176 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
177 | </Compile> | 174 | </Compile> |
178 | <Compile Include="CAPS\AdminWebFront.cs"> | 175 | <Compile Include="VersionInfo.cs"> |
176 | <SubType>Code</SubType> | ||
177 | </Compile> | ||
178 | <Compile Include="Assets\AssetCache.cs"> | ||
179 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
180 | </Compile> | 180 | </Compile> |
181 | <Compile Include="Assets\InventoryCache.cs"> | 181 | <Compile Include="Assets\InventoryCache.cs"> |
182 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
183 | </Compile> | 183 | </Compile> |
184 | <Compile Include="Assets\AssetCache.cs"> | 184 | <Compile Include="CAPS\AdminWebFront.cs"> |
185 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
186 | </Compile> | 186 | </Compile> |
187 | </ItemGroup> | 187 | </ItemGroup> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user deleted file mode 100644 index 082d673..0000000 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ReferencePath>C:\sugilite\bin\</ReferencePath> | ||
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | ||
7 | <ProjectView>ProjectFiles</ProjectView> | ||
8 | <ProjectTrust>0</ProjectTrust> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> | ||
11 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> | ||
12 | </Project> | ||
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index c988025..8384407 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -11,26 +11,26 @@ | |||
11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="NetworkServersInfo.cs" /> | 14 | <include name="AgentAssetUpload.cs" /> |
15 | <include name="UDPServer.cs" /> | ||
16 | <include name="AuthenticateSessionsLocal.cs" /> | 15 | <include name="AuthenticateSessionsLocal.cs" /> |
17 | <include name="AuthenticateSessionsRemote.cs" /> | 16 | <include name="AuthenticateSessionsRemote.cs" /> |
18 | <include name="OpenSimNetworkHandler.cs" /> | 17 | <include name="ClientView.API.cs" /> |
19 | <include name="UserConfigUtility.cs" /> | 18 | <include name="ClientView.cs" /> |
20 | <include name="ClientView.Grid.cs" /> | 19 | <include name="ClientView.Grid.cs" /> |
21 | <include name="PacketServer.cs" /> | ||
22 | <include name="ClientView.PacketHandlers.cs" /> | 20 | <include name="ClientView.PacketHandlers.cs" /> |
23 | <include name="VersionInfo.cs" /> | 21 | <include name="ClientView.ProcessPackets.cs" /> |
24 | <include name="AgentAssetUpload.cs" /> | ||
25 | <include name="ClientViewBase.cs" /> | 22 | <include name="ClientViewBase.cs" /> |
26 | <include name="RegionServerBase.cs" /> | ||
27 | <include name="CommsManager.cs" /> | 23 | <include name="CommsManager.cs" /> |
28 | <include name="ClientView.cs" /> | 24 | <include name="NetworkServersInfo.cs" /> |
29 | <include name="ClientView.API.cs" /> | 25 | <include name="OpenSimNetworkHandler.cs" /> |
30 | <include name="ClientView.ProcessPackets.cs" /> | 26 | <include name="PacketServer.cs" /> |
31 | <include name="CAPS/AdminWebFront.cs" /> | 27 | <include name="RegionServerBase.cs" /> |
32 | <include name="Assets/InventoryCache.cs" /> | 28 | <include name="UDPServer.cs" /> |
29 | <include name="UserConfigUtility.cs" /> | ||
30 | <include name="VersionInfo.cs" /> | ||
33 | <include name="Assets/AssetCache.cs" /> | 31 | <include name="Assets/AssetCache.cs" /> |
32 | <include name="Assets/InventoryCache.cs" /> | ||
33 | <include name="CAPS/AdminWebFront.cs" /> | ||
34 | </sources> | 34 | </sources> |
35 | <references basedir="${project::get-base-directory()}"> | 35 | <references basedir="${project::get-base-directory()}"> |
36 | <lib> | 36 | <lib> |
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs index ab77b5d..f1ca881 100644 --- a/OpenSim/OpenSim.RegionServer/PacketServer.cs +++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs | |||
@@ -66,9 +66,17 @@ namespace OpenSim | |||
66 | 66 | ||
67 | } | 67 | } |
68 | 68 | ||
69 | protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) | ||
70 | { | ||
71 | return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions ); | ||
72 | } | ||
73 | |||
69 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass) | 74 | public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass) |
70 | { | 75 | { |
71 | ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort); | 76 | ClientView newuser = |
77 | CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache, | ||
78 | authenticateSessionsClass); | ||
79 | |||
72 | this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); | 80 | this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); |
73 | this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); | 81 | this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); |
74 | 82 | ||