aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authormingchen2007-07-05 15:15:28 +0000
committermingchen2007-07-05 15:15:28 +0000
commit583f2a9de8e503773a427facd5f81a82b40bd585 (patch)
tree35d434db32056e7d0b231f56f2732c031c130a1d /OpenSim/Region
parent* Tweaks to Java engine (uses less threads). Added support for OnFrame and On... (diff)
downloadopensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.zip
opensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.tar.gz
opensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.tar.bz2
opensim-SC_OLD-583f2a9de8e503773a427facd5f81a82b40bd585.tar.xz
*Removed SimProfile.cs as it is no longer needed (in favor of SimProfileData)
*Added simulator_data_request XMLRPC method to request data from the grid server about a sim instead of faking its login *Login is progressing, now just getting an XML error (http://pastebin.com/942515) -- if you can fix this, throw MingChen in IRC a Private Message
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSim.csproj6
-rw-r--r--OpenSim/Region/Application/OpenSim.exe.build2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj18
-rw-r--r--OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build12
-rw-r--r--OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj6
-rw-r--r--OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs3
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj6
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build2
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj6
-rw-r--r--OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build2
14 files changed, 38 insertions, 37 deletions
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index bec85cc..f5da23d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,13 +170,13 @@
170 </ProjectReference> 170 </ProjectReference>
171 </ItemGroup> 171 </ItemGroup>
172 <ItemGroup> 172 <ItemGroup>
173 <Compile Include="Application.cs"> 173 <Compile Include="VersionInfo.cs">
174 <SubType>Code</SubType> 174 <SubType>Code</SubType>
175 </Compile> 175 </Compile>
176 <Compile Include="OpenSimMain.cs"> 176 <Compile Include="Application.cs">
177 <SubType>Code</SubType> 177 <SubType>Code</SubType>
178 </Compile> 178 </Compile>
179 <Compile Include="VersionInfo.cs"> 179 <Compile Include="OpenSimMain.cs">
180 <SubType>Code</SubType> 180 <SubType>Code</SubType>
181 </Compile> 181 </Compile>
182 </ItemGroup> 182 </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 6c7d7ac..9890cfa 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
11 <resources prefix="OpenSim" dynamicprefix="true" > 11 <resources prefix="OpenSim" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="VersionInfo.cs" />
14 <include name="Application.cs" /> 15 <include name="Application.cs" />
15 <include name="OpenSimMain.cs" /> 16 <include name="OpenSimMain.cs" />
16 <include name="VersionInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
19 <lib> 19 <lib>
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e2486bd..c5c9efc 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -481,4 +481,4 @@ namespace OpenSim
481 } 481 }
482 482
483 483
484} \ No newline at end of file 484}
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
122 </ProjectReference> 122 </ProjectReference>
123 </ItemGroup> 123 </ItemGroup>
124 <ItemGroup> 124 <ItemGroup>
125 <Compile Include="ClientStackNetworkHandler.cs"> 125 <Compile Include="ClientView.AgentAssetUpload.cs">
126 <SubType>Code</SubType> 126 <SubType>Code</SubType>
127 </Compile> 127 </Compile>
128 <Compile Include="ClientView.AgentAssetUpload.cs"> 128 <Compile Include="ClientStackNetworkHandler.cs">
129 <SubType>Code</SubType> 129 <SubType>Code</SubType>
130 </Compile> 130 </Compile>
131 <Compile Include="ClientView.API.cs"> 131 <Compile Include="PacketServer.cs">
132 <SubType>Code</SubType> 132 <SubType>Code</SubType>
133 </Compile> 133 </Compile>
134 <Compile Include="ClientView.cs"> 134 <Compile Include="UDPServer.cs">
135 <SubType>Code</SubType> 135 <SubType>Code</SubType>
136 </Compile> 136 </Compile>
137 <Compile Include="ClientView.PacketHandlers.cs"> 137 <Compile Include="ClientView.PacketHandlers.cs">
138 <SubType>Code</SubType> 138 <SubType>Code</SubType>
139 </Compile> 139 </Compile>
140 <Compile Include="ClientView.ProcessPackets.cs"> 140 <Compile Include="ClientView.API.cs">
141 <SubType>Code</SubType> 141 <SubType>Code</SubType>
142 </Compile> 142 </Compile>
143 <Compile Include="ClientViewBase.cs"> 143 <Compile Include="ClientView.ProcessPackets.cs">
144 <SubType>Code</SubType> 144 <SubType>Code</SubType>
145 </Compile> 145 </Compile>
146 <Compile Include="PacketServer.cs"> 146 <Compile Include="RegionApplicationBase.cs">
147 <SubType>Code</SubType> 147 <SubType>Code</SubType>
148 </Compile> 148 </Compile>
149 <Compile Include="RegionApplicationBase.cs"> 149 <Compile Include="ClientViewBase.cs">
150 <SubType>Code</SubType> 150 <SubType>Code</SubType>
151 </Compile> 151 </Compile>
152 <Compile Include="UDPServer.cs"> 152 <Compile Include="ClientView.cs">
153 <SubType>Code</SubType> 153 <SubType>Code</SubType>
154 </Compile> 154 </Compile>
155 <Compile Include="Assets\InventoryCache.cs"> 155 <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
11 <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ClientStackNetworkHandler.cs" />
15 <include name="ClientView.AgentAssetUpload.cs" /> 14 <include name="ClientView.AgentAssetUpload.cs" />
16 <include name="ClientView.API.cs" /> 15 <include name="ClientStackNetworkHandler.cs" />
17 <include name="ClientView.cs" /> 16 <include name="PacketServer.cs" />
17 <include name="UDPServer.cs" />
18 <include name="ClientView.PacketHandlers.cs" /> 18 <include name="ClientView.PacketHandlers.cs" />
19 <include name="ClientView.API.cs" />
19 <include name="ClientView.ProcessPackets.cs" /> 20 <include name="ClientView.ProcessPackets.cs" />
20 <include name="ClientViewBase.cs" />
21 <include name="PacketServer.cs" />
22 <include name="RegionApplicationBase.cs" /> 21 <include name="RegionApplicationBase.cs" />
23 <include name="UDPServer.cs" /> 22 <include name="ClientViewBase.cs" />
23 <include name="ClientView.cs" />
24 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
25 </sources> 25 </sources>
26 <references basedir="${project::get-base-directory()}"> 26 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49..f9f6b7d 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,13 +98,13 @@
98 </ProjectReference> 98 </ProjectReference>
99 </ItemGroup> 99 </ItemGroup>
100 <ItemGroup> 100 <ItemGroup>
101 <Compile Include="CommunicationsLocal.cs"> 101 <Compile Include="LocalUserServices.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="LocalBackEndServices.cs"> 104 <Compile Include="CommunicationsLocal.cs">
105 <SubType>Code</SubType> 105 <SubType>Code</SubType>
106 </Compile> 106 </Compile>
107 <Compile Include="LocalUserServices.cs"> 107 <Compile Include="LocalBackEndServices.cs">
108 <SubType>Code</SubType> 108 <SubType>Code</SubType>
109 </Compile> 109 </Compile>
110 <Compile Include="Properties\AssemblyInfo.cs"> 110 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 3cac9d3..bfefabf 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
11 <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="LocalUserServices.cs" />
14 <include name="CommunicationsLocal.cs" /> 15 <include name="CommunicationsLocal.cs" />
15 <include name="LocalBackEndServices.cs" /> 16 <include name="LocalBackEndServices.cs" />
16 <include name="LocalUserServices.cs" />
17 <include name="Properties/AssemblyInfo.cs" /> 17 <include name="Properties/AssemblyInfo.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 99e9c96..e8ed7f4 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
35 35
36 GridParams["authkey"] = serversInfo.GridSendKey; 36 GridParams["authkey"] = serversInfo.GridSendKey;
37 GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated(); 37 GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
38 GridParams["sim_ip"] = regionInfo.InternalEndPoint.Address.ToString(); 38 GridParams["sim_ip"] = regionInfo.ExternalHostName;
39 GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString(); 39 GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();
40 GridParams["region_locx"] = regionInfo.RegionLocX.ToString(); 40 GridParams["region_locx"] = regionInfo.RegionLocX.ToString();
41 GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); 41 GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
@@ -166,6 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
166 // Grid Request Processing 166 // Grid Request Processing
167 public XmlRpcResponse ExpectUser(XmlRpcRequest request) 167 public XmlRpcResponse ExpectUser(XmlRpcRequest request)
168 { 168 {
169 Console.WriteLine("Expecting User...");
169 Hashtable requestData = (Hashtable)request.Params[0]; 170 Hashtable requestData = (Hashtable)request.Params[0];
170 AgentCircuitData agentData = new AgentCircuitData(); 171 AgentCircuitData agentData = new AgentCircuitData();
171 agentData.SessionID = new LLUUID((string)requestData["session_id"]); 172 agentData.SessionID = new LLUUID((string)requestData["session_id"]);
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index d6abd13..390326e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
116 </ProjectReference> 116 </ProjectReference>
117 </ItemGroup> 117 </ItemGroup>
118 <ItemGroup> 118 <ItemGroup>
119 <Compile Include="CommunicationsOGS1.cs"> 119 <Compile Include="OGS1UserServices.cs">
120 <SubType>Code</SubType> 120 <SubType>Code</SubType>
121 </Compile> 121 </Compile>
122 <Compile Include="OGS1GridServices.cs"> 122 <Compile Include="CommunicationsOGS1.cs">
123 <SubType>Code</SubType> 123 <SubType>Code</SubType>
124 </Compile> 124 </Compile>
125 <Compile Include="OGS1InterSimComms.cs"> 125 <Compile Include="OGS1InterSimComms.cs">
126 <SubType>Code</SubType> 126 <SubType>Code</SubType>
127 </Compile> 127 </Compile>
128 <Compile Include="OGS1UserServices.cs"> 128 <Compile Include="OGS1GridServices.cs">
129 <SubType>Code</SubType> 129 <SubType>Code</SubType>
130 </Compile> 130 </Compile>
131 <Compile Include="Properties\AssemblyInfo.cs"> 131 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 04d61b9..06f0b9e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
11 <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="OGS1UserServices.cs" />
14 <include name="CommunicationsOGS1.cs" /> 15 <include name="CommunicationsOGS1.cs" />
15 <include name="OGS1GridServices.cs" />
16 <include name="OGS1InterSimComms.cs" /> 16 <include name="OGS1InterSimComms.cs" />
17 <include name="OGS1UserServices.cs" /> 17 <include name="OGS1GridServices.cs" />
18 <include name="Properties/AssemblyInfo.cs" /> 18 <include name="Properties/AssemblyInfo.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 1e726b2..d3f2518 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -154,10 +154,10 @@
154 </ProjectReference> 154 </ProjectReference>
155 </ItemGroup> 155 </ItemGroup>
156 <ItemGroup> 156 <ItemGroup>
157 <Compile Include="LlsdMethodEntry.cs"> 157 <Compile Include="MyWorld.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="MyWorld.cs"> 160 <Compile Include="LlsdMethodEntry.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="Program.cs"> 163 <Compile Include="Program.cs">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index a826a37..ffcf59e 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -11,8 +11,8 @@
11 <resources prefix="SimpleApp" dynamicprefix="true" > 11 <resources prefix="SimpleApp" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="LlsdMethodEntry.cs" />
15 <include name="MyWorld.cs" /> 14 <include name="MyWorld.cs" />
15 <include name="LlsdMethodEntry.cs" />
16 <include name="Program.cs" /> 16 <include name="Program.cs" />
17 <include name="Properties/AssemblyInfo.cs" /> 17 <include name="Properties/AssemblyInfo.cs" />
18 </sources> 18 </sources>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c..716fd57 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
93 <Compile Include="AssemblyInfo.cs"> 93 <Compile Include="AssemblyInfo.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="Db4LocalStorage.cs">
97 <SubType>Code</SubType>
98 </Compile>
99 <Compile Include="MapStorage.cs"> 96 <Compile Include="MapStorage.cs">
100 <SubType>Code</SubType> 97 <SubType>Code</SubType>
101 </Compile> 98 </Compile>
@@ -105,6 +102,9 @@
105 <Compile Include="UUIDPrimQuery.cs"> 102 <Compile Include="UUIDPrimQuery.cs">
106 <SubType>Code</SubType> 103 <SubType>Code</SubType>
107 </Compile> 104 </Compile>
105 <Compile Include="Db4LocalStorage.cs">
106 <SubType>Code</SubType>
107 </Compile>
108 </ItemGroup> 108 </ItemGroup>
109 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 109 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
110 <PropertyGroup> 110 <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index fc9f055..112ff1c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="Db4LocalStorage.cs" />
16 <include name="MapStorage.cs" /> 15 <include name="MapStorage.cs" />
17 <include name="UUIDParcelQuery.cs" /> 16 <include name="UUIDParcelQuery.cs" />
18 <include name="UUIDPrimQuery.cs" /> 17 <include name="UUIDPrimQuery.cs" />
18 <include name="Db4LocalStorage.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
21 <lib> 21 <lib>