aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-07-05 15:15:28 +0000
committermingchen2007-07-05 15:15:28 +0000
commit583f2a9de8e503773a427facd5f81a82b40bd585 (patch)
tree35d434db32056e7d0b231f56f2732c031c130a1d
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
-rw-r--r--OpenGridServices.sln127
-rw-r--r--OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj6
-rw-r--r--OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build4
-rw-r--r--OpenSim/Framework/Console/OpenSim.Framework.Console.csproj4
-rw-r--r--OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build2
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj6
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build2
-rw-r--r--OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj10
-rw-r--r--OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build6
-rw-r--r--OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj4
-rw-r--r--OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build2
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.csproj46
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build4
-rw-r--r--OpenSim/Framework/Data/SimProfileData.cs70
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj61
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.dll.build39
-rw-r--r--OpenSim/Framework/General/SimProfile.cs119
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs35
-rw-r--r--OpenSim/Grid/GridServer/Main.cs1
-rw-r--r--OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj4
-rw-r--r--OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs21
-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
-rw-r--r--Prebuild/src/Prebuild.csproj56
-rw-r--r--Prebuild/src/Prebuild.exe.build34
-rw-r--r--prebuild.xml1
40 files changed, 365 insertions, 380 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2343bc0..5f47b6b 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual C# Express 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@@ -25,72 +25,61 @@ EndProject
25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
26EndProject 26EndProject
27Global 27Global
28 GlobalSection(SolutionConfigurationPlatforms) = preSolution 28 GlobalSection(SolutionConfigurationPlatforms) = preSolution
29 Debug|Any CPU = Debug|Any CPU 29 Debug|Any CPU = Debug|Any CPU
30 Release|Any CPU = Release|Any CPU 30 Release|Any CPU = Release|Any CPU
31 EndGlobalSection 31 EndGlobalSection
32 GlobalSection(ProjectDependencies) = postSolution 32 GlobalSection(ProjectConfigurationPlatforms) = postSolution
33 ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) 33 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34 ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000}) 34 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
35 ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) 35 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
36 ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000}) 36 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
37 ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) 37 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38 ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) 38 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
39 ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000}) 39 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
40 ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) 40 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
41 ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000}) 41 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42 EndGlobalSection 42 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
43 GlobalSection(ProjectConfigurationPlatforms) = postSolution 43 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
44 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 44 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
45 {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 45 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 46 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
47 {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 47 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
48 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 48 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
49 {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 49 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 50 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 51 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 52 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
53 {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 53 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 54 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 55 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 56 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
57 {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 57 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 58 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 59 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 60 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
61 {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 61 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 62 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 63 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 64 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
65 {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 65 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 66 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 67 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 68 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
69 {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 69 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 70 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 71 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 72 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
73 {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 73 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 74 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 75 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 76 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
77 {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 77 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 78 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 79 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 80 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
81 {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 81 EndGlobalSection
82 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 82 GlobalSection(SolutionProperties) = preSolution
83 {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 83 HideSolutionNode = FALSE
84 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 84 EndGlobalSection
85 {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
86 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
87 {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
88 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
89 {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
90 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
91 {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
92 EndGlobalSection
93 GlobalSection(SolutionProperties) = preSolution
94 HideSolutionNode = FALSE
95 EndGlobalSection
96EndGlobal 85EndGlobal
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..0ee62e9 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,16 +86,16 @@
86 </ProjectReference> 86 </ProjectReference>
87 </ItemGroup> 87 </ItemGroup>
88 <ItemGroup> 88 <ItemGroup>
89 <Compile Include="CommunicationsManager.cs"> 89 <Compile Include="IUserServices.cs">
90 <SubType>Code</SubType> 90 <SubType>Code</SubType>
91 </Compile> 91 </Compile>
92 <Compile Include="IGridServices.cs"> 92 <Compile Include="IGridServices.cs">
93 <SubType>Code</SubType> 93 <SubType>Code</SubType>
94 </Compile> 94 </Compile>
95 <Compile Include="IInterRegionCommunications.cs"> 95 <Compile Include="CommunicationsManager.cs">
96 <SubType>Code</SubType> 96 <SubType>Code</SubType>
97 </Compile> 97 </Compile>
98 <Compile Include="IUserServices.cs"> 98 <Compile Include="IInterRegionCommunications.cs">
99 <SubType>Code</SubType> 99 <SubType>Code</SubType>
100 </Compile> 100 </Compile>
101 <Compile Include="Properties\AssemblyInfo.cs"> 101 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6..8b0e0f6 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
11 <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="CommunicationsManager.cs" /> 14 <include name="IUserServices.cs" />
15 <include name="IGridServices.cs" /> 15 <include name="IGridServices.cs" />
16 <include name="CommunicationsManager.cs" />
16 <include name="IInterRegionCommunications.cs" /> 17 <include name="IInterRegionCommunications.cs" />
17 <include name="IUserServices.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/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
index f3dcec5..c02a506 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
@@ -69,10 +69,10 @@
69 <Compile Include="AssemblyInfo.cs"> 69 <Compile Include="AssemblyInfo.cs">
70 <SubType>Code</SubType> 70 <SubType>Code</SubType>
71 </Compile> 71 </Compile>
72 <Compile Include="ConsoleCallbacksBase.cs"> 72 <Compile Include="LogBase.cs">
73 <SubType>Code</SubType> 73 <SubType>Code</SubType>
74 </Compile> 74 </Compile>
75 <Compile Include="LogBase.cs"> 75 <Compile Include="ConsoleCallbacksBase.cs">
76 <SubType>Code</SubType> 76 <SubType>Code</SubType>
77 </Compile> 77 </Compile>
78 <Compile Include="MainLog.cs"> 78 <Compile Include="MainLog.cs">
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
index eb40c0d..10e72a1 100644
--- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
@@ -12,8 +12,8 @@
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="ConsoleCallbacksBase.cs" />
16 <include name="LogBase.cs" /> 15 <include name="LogBase.cs" />
16 <include name="ConsoleCallbacksBase.cs" />
17 <include name="MainLog.cs" /> 17 <include name="MainLog.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
index b09cecf..c7b4870 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="DB4oGridData.cs"> 91 <Compile Include="DB4oUserData.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="DB4oManager.cs"> 94 <Compile Include="DB4oGridData.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="DB4oUserData.cs"> 97 <Compile Include="DB4oManager.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="Properties\AssemblyInfo.cs"> 100 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
index f124eb5..efccdc1 100644
--- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
+++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
11 <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="DB4oUserData.cs" />
14 <include name="DB4oGridData.cs" /> 15 <include name="DB4oGridData.cs" />
15 <include name="DB4oManager.cs" /> 16 <include name="DB4oManager.cs" />
16 <include name="DB4oUserData.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/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
index 62e3887..09a32b5 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="MySQLGridData.cs">
92 <SubType>Code</SubType>
93 </Compile>
94 <Compile Include="MySQLInventoryData.cs"> 91 <Compile Include="MySQLInventoryData.cs">
95 <SubType>Code</SubType> 92 <SubType>Code</SubType>
96 </Compile> 93 </Compile>
97 <Compile Include="MySQLLogData.cs"> 94 <Compile Include="MySQLUserData.cs">
98 <SubType>Code</SubType> 95 <SubType>Code</SubType>
99 </Compile> 96 </Compile>
100 <Compile Include="MySQLManager.cs"> 97 <Compile Include="MySQLManager.cs">
101 <SubType>Code</SubType> 98 <SubType>Code</SubType>
102 </Compile> 99 </Compile>
103 <Compile Include="MySQLUserData.cs"> 100 <Compile Include="MySQLLogData.cs">
101 <SubType>Code</SubType>
102 </Compile>
103 <Compile Include="MySQLGridData.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="Properties\AssemblyInfo.cs"> 106 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
index 594ec52..3aeebbc 100644
--- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
+++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
11 <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="MySQLGridData.cs" />
15 <include name="MySQLInventoryData.cs" /> 14 <include name="MySQLInventoryData.cs" />
16 <include name="MySQLLogData.cs" />
17 <include name="MySQLManager.cs" />
18 <include name="MySQLUserData.cs" /> 15 <include name="MySQLUserData.cs" />
16 <include name="MySQLManager.cs" />
17 <include name="MySQLLogData.cs" />
18 <include name="MySQLGridData.cs" />
19 <include name="Properties/AssemblyInfo.cs" /> 19 <include name="Properties/AssemblyInfo.cs" />
20 </sources> 20 </sources>
21 <references basedir="${project::get-base-directory()}"> 21 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
index 4ba24f1..dab22ea 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="SQLiteGridData.cs"> 91 <Compile Include="SQLiteManager.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="SQLiteManager.cs"> 94 <Compile Include="SQLiteGridData.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="Properties\AssemblyInfo.cs"> 97 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
index e28d0a6..719fbc6 100644
--- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
+++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="SQLiteGridData.cs" />
15 <include name="SQLiteManager.cs" /> 14 <include name="SQLiteManager.cs" />
15 <include name="SQLiteGridData.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
index dcafbcd..6077266 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Framework.Data</AssemblyName> 13 <AssemblyName>OpenSim.Framework.Data</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Framework.Data</RootNamespace> 21 <RootNamespace>OpenSim.Framework.Data</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,29 +61,34 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System" > 72 <Reference Include="System">
66 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Data" > 76 <Reference Include="System.Data">
70 <HintPath>System.Data.dll</HintPath> 77 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System.Xml" > 80 <Reference Include="System.Xml">
74 <HintPath>System.Xml.dll</HintPath> 81 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
84 <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
77 </ItemGroup> 85 </ItemGroup>
78 <ItemGroup> 86 <ItemGroup>
79 </ItemGroup> 87 </ItemGroup>
80 <ItemGroup> 88 <ItemGroup>
89 <Compile Include="ReservationData.cs">
90 <SubType>Code</SubType>
91 </Compile>
81 <Compile Include="GridData.cs"> 92 <Compile Include="GridData.cs">
82 <SubType>Code</SubType> 93 <SubType>Code</SubType>
83 </Compile> 94 </Compile>
@@ -90,18 +101,15 @@
90 <Compile Include="InventoryData.cs"> 101 <Compile Include="InventoryData.cs">
91 <SubType>Code</SubType> 102 <SubType>Code</SubType>
92 </Compile> 103 </Compile>
93 <Compile Include="ReservationData.cs">
94 <SubType>Code</SubType>
95 </Compile>
96 <Compile Include="SimProfileData.cs">
97 <SubType>Code</SubType>
98 </Compile>
99 <Compile Include="UserData.cs"> 104 <Compile Include="UserData.cs">
100 <SubType>Code</SubType> 105 <SubType>Code</SubType>
101 </Compile> 106 </Compile>
102 <Compile Include="UserProfileData.cs"> 107 <Compile Include="UserProfileData.cs">
103 <SubType>Code</SubType> 108 <SubType>Code</SubType>
104 </Compile> 109 </Compile>
110 <Compile Include="SimProfileData.cs">
111 <SubType>Code</SubType>
112 </Compile>
105 <Compile Include="Properties\AssemblyInfo.cs"> 113 <Compile Include="Properties\AssemblyInfo.cs">
106 <SubType>Code</SubType> 114 <SubType>Code</SubType>
107 </Compile> 115 </Compile>
@@ -113,4 +121,4 @@
113 <PostBuildEvent> 121 <PostBuildEvent>
114 </PostBuildEvent> 122 </PostBuildEvent>
115 </PropertyGroup> 123 </PropertyGroup>
116</Project> 124</Project> \ No newline at end of file
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b..6b489f2 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,14 +11,14 @@
11 <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="ReservationData.cs" />
14 <include name="GridData.cs" /> 15 <include name="GridData.cs" />
15 <include name="ILogData.cs" /> 16 <include name="ILogData.cs" />
16 <include name="IniConfig.cs" /> 17 <include name="IniConfig.cs" />
17 <include name="InventoryData.cs" /> 18 <include name="InventoryData.cs" />
18 <include name="ReservationData.cs" />
19 <include name="SimProfileData.cs" />
20 <include name="UserData.cs" /> 19 <include name="UserData.cs" />
21 <include name="UserProfileData.cs" /> 20 <include name="UserProfileData.cs" />
21 <include name="SimProfileData.cs" />
22 <include name="Properties/AssemblyInfo.cs" /> 22 <include name="Properties/AssemblyInfo.cs" />
23 </sources> 23 </sources>
24 <references basedir="${project::get-base-directory()}"> 24 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index 3dddfb4..9db8574 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -26,6 +26,10 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using Nwc.XmlRpc;
30
31using System;
32using System.Collections;
29 33
30namespace OpenSim.Framework.Data 34namespace OpenSim.Framework.Data
31{ 35{
@@ -108,5 +112,71 @@ namespace OpenSim.Framework.Data
108 /// Region Map Texture Asset 112 /// Region Map Texture Asset
109 /// </summary> 113 /// </summary>
110 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006"); 114 public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
115
116 /// <summary>
117 /// Get Sim profile data from grid server when in grid mode
118 /// </summary>
119 /// <param name="region_uuid"></param>
120 /// <param name="gridserver_url"></param>
121 /// <param name="?"></param>
122 /// <returns></returns>
123 public SimProfileData RequestSimProfileData(LLUUID region_uuid, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
124 {
125 Hashtable requestData = new Hashtable();
126 requestData["region_uuid"] = region_uuid.UUID.ToString();
127 requestData["authkey"] = gridserver_sendkey;
128 ArrayList SendParams = new ArrayList();
129 SendParams.Add(requestData);
130 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
131 XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
132
133 Hashtable responseData = (Hashtable)GridResp.Value;
134
135 if (responseData.ContainsKey("error"))
136 {
137 return null;
138 }
139
140 SimProfileData simData = new SimProfileData();
141 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
142 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
143 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
144 simData.serverIP = (string)responseData["sim_ip"];
145 simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);
146 simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";
147 simData.UUID = new LLUUID((string)responseData["region_UUID"]);
148 simData.regionName = (string)responseData["region_name"];
149
150 return simData;
151 }
152 public SimProfileData RequestSimProfileData(ulong region_handle, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
153 {
154 Hashtable requestData = new Hashtable();
155 requestData["region_handle"] = region_handle.ToString();
156 requestData["authkey"] = gridserver_sendkey;
157 ArrayList SendParams = new ArrayList();
158 SendParams.Add(requestData);
159 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
160 XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
161
162 Hashtable responseData = (Hashtable)GridResp.Value;
163
164 if (responseData.ContainsKey("error"))
165 {
166 return null;
167 }
168
169 SimProfileData simData = new SimProfileData();
170 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
171 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
172 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
173 simData.serverIP = (string)responseData["sim_ip"];
174 simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);
175 simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";
176 simData.UUID = new LLUUID((string)responseData["region_UUID"]);
177 simData.regionName = (string)responseData["region_name"];
178
179 return simData;
180 }
111 } 181 }
112} 182}
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index a577ea3..4a72db0 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -97,103 +97,100 @@
97 <Compile Include="BlockingQueue.cs"> 97 <Compile Include="BlockingQueue.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="IRegionCommsListener.cs"> 100 <Compile Include="Util.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="LoginService.cs"> 103 <Compile Include="UserProfile.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="RegionCommsListener.cs"> 106 <Compile Include="IRegionCommsListener.cs">
107 <SubType>Code</SubType> 107 <SubType>Code</SubType>
108 </Compile> 108 </Compile>
109 <Compile Include="Remoting.cs"> 109 <Compile Include="Remoting.cs">
110 <SubType>Code</SubType> 110 <SubType>Code</SubType>
111 </Compile> 111 </Compile>
112 <Compile Include="SimProfile.cs"> 112 <Compile Include="RegionCommsListener.cs">
113 <SubType>Code</SubType>
114 </Compile>
115 <Compile Include="UserProfile.cs">
116 <SubType>Code</SubType> 113 <SubType>Code</SubType>
117 </Compile> 114 </Compile>
118 <Compile Include="Util.cs"> 115 <Compile Include="LoginService.cs">
119 <SubType>Code</SubType> 116 <SubType>Code</SubType>
120 </Compile> 117 </Compile>
121 <Compile Include="Interfaces\AuthenticateResponse.cs"> 118 <Compile Include="Interfaces\AuthenticateResponse.cs">
122 <SubType>Code</SubType> 119 <SubType>Code</SubType>
123 </Compile> 120 </Compile>
124 <Compile Include="Interfaces\IAssetServer.cs"> 121 <Compile Include="Interfaces\IUserServer.cs">
125 <SubType>Code</SubType> 122 <SubType>Code</SubType>
126 </Compile> 123 </Compile>
127 <Compile Include="Interfaces\IClientAPI.cs"> 124 <Compile Include="Interfaces\IAssetServer.cs">
128 <SubType>Code</SubType> 125 <SubType>Code</SubType>
129 </Compile> 126 </Compile>
130 <Compile Include="Interfaces\ILocalStorage.cs"> 127 <Compile Include="Interfaces\IWorld.cs">
131 <SubType>Code</SubType> 128 <SubType>Code</SubType>
132 </Compile> 129 </Compile>
133 <Compile Include="Interfaces\IUserServer.cs"> 130 <Compile Include="Interfaces\IClientAPI.cs">
134 <SubType>Code</SubType> 131 <SubType>Code</SubType>
135 </Compile> 132 </Compile>
136 <Compile Include="Interfaces\IWorld.cs"> 133 <Compile Include="Interfaces\ILocalStorage.cs">
137 <SubType>Code</SubType> 134 <SubType>Code</SubType>
138 </Compile> 135 </Compile>
139 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 136 <Compile Include="Interfaces\Config\IGenericConfig.cs">
140 <SubType>Code</SubType> 137 <SubType>Code</SubType>
141 </Compile> 138 </Compile>
142 <Compile Include="Interfaces\Config\IGridConfig.cs"> 139 <Compile Include="Interfaces\Config\IUserConfig.cs">
143 <SubType>Code</SubType> 140 <SubType>Code</SubType>
144 </Compile> 141 </Compile>
145 <Compile Include="Interfaces\Config\IUserConfig.cs"> 142 <Compile Include="Interfaces\Config\IGridConfig.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
148 <Compile Include="Properties\AssemblyInfo.cs"> 145 <Compile Include="Types\MapBlockData.cs">
149 <SubType>Code</SubType> 146 <SubType>Code</SubType>
150 </Compile> 147 </Compile>
151 <Compile Include="Types\AgentCiruitData.cs"> 148 <Compile Include="Types\PrimitiveBaseShape.cs">
152 <SubType>Code</SubType> 149 <SubType>Code</SubType>
153 </Compile> 150 </Compile>
154 <Compile Include="Types\AgentWearable.cs"> 151 <Compile Include="Types\AssetLandmark.cs">
155 <SubType>Code</SubType> 152 <SubType>Code</SubType>
156 </Compile> 153 </Compile>
157 <Compile Include="Types\AssetBase.cs"> 154 <Compile Include="Types\NeighbourInfo.cs">
158 <SubType>Code</SubType> 155 <SubType>Code</SubType>
159 </Compile> 156 </Compile>
160 <Compile Include="Types\AssetLandmark.cs"> 157 <Compile Include="Types\RegionInfo.cs">
161 <SubType>Code</SubType> 158 <SubType>Code</SubType>
162 </Compile> 159 </Compile>
163 <Compile Include="Types\AssetStorage.cs"> 160 <Compile Include="Types\RegionHandle.cs">
164 <SubType>Code</SubType> 161 <SubType>Code</SubType>
165 </Compile> 162 </Compile>
166 <Compile Include="Types\EstateSettings.cs"> 163 <Compile Include="Types\ParcelData.cs">
167 <SubType>Code</SubType> 164 <SubType>Code</SubType>
168 </Compile> 165 </Compile>
169 <Compile Include="Types\Login.cs"> 166 <Compile Include="Types\PrimData.cs">
170 <SubType>Code</SubType> 167 <SubType>Code</SubType>
171 </Compile> 168 </Compile>
172 <Compile Include="Types\MapBlockData.cs"> 169 <Compile Include="Types\AgentWearable.cs">
173 <SubType>Code</SubType> 170 <SubType>Code</SubType>
174 </Compile> 171 </Compile>
175 <Compile Include="Types\NeighbourInfo.cs"> 172 <Compile Include="Types\AssetStorage.cs">
176 <SubType>Code</SubType> 173 <SubType>Code</SubType>
177 </Compile> 174 </Compile>
178 <Compile Include="Types\NetworkServersInfo.cs"> 175 <Compile Include="Types\UUID.cs">
179 <SubType>Code</SubType> 176 <SubType>Code</SubType>
180 </Compile> 177 </Compile>
181 <Compile Include="Types\ParcelData.cs"> 178 <Compile Include="Types\EstateSettings.cs">
182 <SubType>Code</SubType> 179 <SubType>Code</SubType>
183 </Compile> 180 </Compile>
184 <Compile Include="Types\PrimData.cs"> 181 <Compile Include="Types\Login.cs">
185 <SubType>Code</SubType> 182 <SubType>Code</SubType>
186 </Compile> 183 </Compile>
187 <Compile Include="Types\PrimitiveBaseShape.cs"> 184 <Compile Include="Types\AgentCiruitData.cs">
188 <SubType>Code</SubType> 185 <SubType>Code</SubType>
189 </Compile> 186 </Compile>
190 <Compile Include="Types\RegionHandle.cs"> 187 <Compile Include="Types\AssetBase.cs">
191 <SubType>Code</SubType> 188 <SubType>Code</SubType>
192 </Compile> 189 </Compile>
193 <Compile Include="Types\RegionInfo.cs"> 190 <Compile Include="Types\NetworkServersInfo.cs">
194 <SubType>Code</SubType> 191 <SubType>Code</SubType>
195 </Compile> 192 </Compile>
196 <Compile Include="Types\UUID.cs"> 193 <Compile Include="Properties\AssemblyInfo.cs">
197 <SubType>Code</SubType> 194 <SubType>Code</SubType>
198 </Compile> 195 </Compile>
199 </ItemGroup> 196 </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 10fafbf..9fb35bc 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -14,39 +14,38 @@
14 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
15 <include name="AuthenticateSessionBase.cs" /> 15 <include name="AuthenticateSessionBase.cs" />
16 <include name="BlockingQueue.cs" /> 16 <include name="BlockingQueue.cs" />
17 <include name="Util.cs" />
18 <include name="UserProfile.cs" />
17 <include name="IRegionCommsListener.cs" /> 19 <include name="IRegionCommsListener.cs" />
18 <include name="LoginService.cs" />
19 <include name="RegionCommsListener.cs" />
20 <include name="Remoting.cs" /> 20 <include name="Remoting.cs" />
21 <include name="SimProfile.cs" /> 21 <include name="RegionCommsListener.cs" />
22 <include name="UserProfile.cs" /> 22 <include name="LoginService.cs" />
23 <include name="Util.cs" />
24 <include name="Interfaces/AuthenticateResponse.cs" /> 23 <include name="Interfaces/AuthenticateResponse.cs" />
24 <include name="Interfaces/IUserServer.cs" />
25 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
26 <include name="Interfaces/IWorld.cs" />
26 <include name="Interfaces/IClientAPI.cs" /> 27 <include name="Interfaces/IClientAPI.cs" />
27 <include name="Interfaces/ILocalStorage.cs" /> 28 <include name="Interfaces/ILocalStorage.cs" />
28 <include name="Interfaces/IUserServer.cs" />
29 <include name="Interfaces/IWorld.cs" />
30 <include name="Interfaces/Config/IGenericConfig.cs" /> 29 <include name="Interfaces/Config/IGenericConfig.cs" />
31 <include name="Interfaces/Config/IGridConfig.cs" />
32 <include name="Interfaces/Config/IUserConfig.cs" /> 30 <include name="Interfaces/Config/IUserConfig.cs" />
33 <include name="Properties/AssemblyInfo.cs" /> 31 <include name="Interfaces/Config/IGridConfig.cs" />
34 <include name="Types/AgentCiruitData.cs" />
35 <include name="Types/AgentWearable.cs" />
36 <include name="Types/AssetBase.cs" />
37 <include name="Types/AssetLandmark.cs" />
38 <include name="Types/AssetStorage.cs" />
39 <include name="Types/EstateSettings.cs" />
40 <include name="Types/Login.cs" />
41 <include name="Types/MapBlockData.cs" /> 32 <include name="Types/MapBlockData.cs" />
33 <include name="Types/PrimitiveBaseShape.cs" />
34 <include name="Types/AssetLandmark.cs" />
42 <include name="Types/NeighbourInfo.cs" /> 35 <include name="Types/NeighbourInfo.cs" />
43 <include name="Types/NetworkServersInfo.cs" /> 36 <include name="Types/RegionInfo.cs" />
37 <include name="Types/RegionHandle.cs" />
44 <include name="Types/ParcelData.cs" /> 38 <include name="Types/ParcelData.cs" />
45 <include name="Types/PrimData.cs" /> 39 <include name="Types/PrimData.cs" />
46 <include name="Types/PrimitiveBaseShape.cs" /> 40 <include name="Types/AgentWearable.cs" />
47 <include name="Types/RegionHandle.cs" /> 41 <include name="Types/AssetStorage.cs" />
48 <include name="Types/RegionInfo.cs" />
49 <include name="Types/UUID.cs" /> 42 <include name="Types/UUID.cs" />
43 <include name="Types/EstateSettings.cs" />
44 <include name="Types/Login.cs" />
45 <include name="Types/AgentCiruitData.cs" />
46 <include name="Types/AssetBase.cs" />
47 <include name="Types/NetworkServersInfo.cs" />
48 <include name="Properties/AssemblyInfo.cs" />
50 </sources> 49 </sources>
51 <references basedir="${project::get-base-directory()}"> 50 <references basedir="${project::get-base-directory()}">
52 <lib> 51 <lib>
diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
deleted file mode 100644
index 47f1af3..0000000
--- a/OpenSim/Framework/General/SimProfile.cs
+++ /dev/null
@@ -1,119 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using libsecondlife;
31using Nwc.XmlRpc;
32
33namespace OpenSim.Framework.Sims
34{
35 public class SimProfile
36 {
37 public LLUUID UUID;
38 public ulong regionhandle;
39 public string regionname;
40 public string sim_ip;
41 public uint sim_port;
42 public string caps_url;
43 public uint RegionLocX;
44 public uint RegionLocY;
45 public string sendkey;
46 public string recvkey;
47 public bool online;
48
49 public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)
50 {
51 try
52 {
53 Hashtable GridReqParams = new Hashtable();
54 GridReqParams["region_handle"] = region_handle.ToString();
55 GridReqParams["authkey"] = SendKey;
56 ArrayList SendParams = new ArrayList();
57 SendParams.Add(GridReqParams);
58 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
59
60 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
61
62 Hashtable RespData = (Hashtable)GridResp.Value;
63 this.UUID = new LLUUID((string)RespData["UUID"]);
64 this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
65 this.regionname = (string)RespData["regionname"];
66 this.sim_ip = (string)RespData["sim_ip"];
67 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
68 this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
69 this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
70 this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
71 this.sendkey = SendKey;
72 this.recvkey = RecvKey;
73 }
74 catch (Exception e)
75 {
76 System.Console.WriteLine(e.ToString());
77 }
78 return this;
79 }
80
81 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
82 {
83 try
84 {
85 Hashtable GridReqParams = new Hashtable();
86 GridReqParams["UUID"] = UUID.ToString();
87 GridReqParams["authkey"] = SendKey;
88 ArrayList SendParams = new ArrayList();
89 SendParams.Add(GridReqParams);
90 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
91
92 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
93
94 Hashtable RespData = (Hashtable)GridResp.Value;
95 this.UUID = new LLUUID((string)RespData["UUID"]);
96 this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
97 this.regionname = (string)RespData["regionname"];
98 this.sim_ip = (string)RespData["sim_ip"];
99 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
100 this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
101 this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
102 this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
103 this.sendkey = SendKey;
104 this.recvkey = RecvKey;
105 }
106 catch (Exception e)
107 {
108 System.Console.WriteLine(e.ToString());
109 }
110 return this;
111 }
112
113
114 public SimProfile()
115 {
116 }
117 }
118
119}
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index f316cc7..af5feac 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -357,6 +357,8 @@ namespace OpenSim.Framework.UserManagement
357 /// <returns>The response to send</returns> 357 /// <returns>The response to send</returns>
358 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) 358 public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
359 { 359 {
360
361 System.Console.WriteLine("Attempting login now...");
360 XmlRpcResponse response = new XmlRpcResponse(); 362 XmlRpcResponse response = new XmlRpcResponse();
361 Hashtable requestData = (Hashtable)request.Params[0]; 363 Hashtable requestData = (Hashtable)request.Params[0];
362 364
@@ -457,11 +459,13 @@ namespace OpenSim.Framework.UserManagement
457 { 459 {
458 System.Console.WriteLine(e.ToString()); 460 System.Console.WriteLine(e.ToString());
459 return logResponse.CreateDeadRegionResponse(); 461 return logResponse.CreateDeadRegionResponse();
462 //return logResponse.ToXmlRpcResponse();
460 } 463 }
461 CommitAgent(ref userProfile); 464 CommitAgent(ref userProfile);
462 return logResponse.ToXmlRpcResponse(); 465 return logResponse.ToXmlRpcResponse();
463 466
464 } 467 }
468
465 catch (Exception E) 469 catch (Exception E)
466 { 470 {
467 System.Console.WriteLine(E.ToString()); 471 System.Console.WriteLine(E.ToString());
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 1e457b3..422385d 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -268,6 +268,7 @@ namespace OpenSim.Grid.GridServer
268 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); 268 TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
269 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; 269 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
270 270
271 Console.WriteLine("NEW SIM: " + TheSim.serverURI);
271 TheSim.regionName = (string)requestData["sim_name"]; 272 TheSim.regionName = (string)requestData["sim_name"];
272 TheSim.UUID = new LLUUID((string)requestData["UUID"]); 273 TheSim.UUID = new LLUUID((string)requestData["UUID"]);
273 274
@@ -376,6 +377,40 @@ namespace OpenSim.Grid.GridServer
376 return response; 377 return response;
377 } 378 }
378 379
380 public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request)
381 {
382 Hashtable requestData = (Hashtable)request.Params[0];
383 Hashtable responseData = new Hashtable();
384 SimProfileData simData = null;
385 if (requestData.ContainsKey("region_UUID"))
386 {
387 simData = getRegion(new LLUUID((string)requestData["region_UUID"]));
388 }
389 else if (requestData.ContainsKey("region_handle"))
390 {
391 simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"]));
392 }
393
394 if (simData == null)
395 {
396 //Sim does not exist
397 responseData["error"] = "Sim does not exist";
398 }
399 else
400 {
401 responseData["sim_ip"] = simData.serverIP;
402 responseData["sim_port"] = simData.serverPort.ToString();
403 responseData["region_locx"] = simData.regionLocX;
404 responseData["region_locy"] = simData.regionLocY;
405 responseData["region_UUID"] = simData.UUID.UUID.ToString();
406 responseData["region_name"] = simData.regionName;
407 }
408
409 XmlRpcResponse response = new XmlRpcResponse();
410 response.Value = responseData;
411 return response;
412 }
413
379 public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request) 414 public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request)
380 { 415 {
381 int xmin=980, ymin=980, xmax=1020, ymax=1020; 416 int xmin=980, ymin=980, xmax=1020, ymax=1020;
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index a990ff7..dc5e4fa 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -125,6 +125,7 @@ namespace OpenSim.Grid.GridServer
125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); 125 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
126 126
127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); 127 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
128 httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
128 httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod); 129 httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
129 130
130 httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod )); 131 httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod ));
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
index 424072e..7fbb581 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj
@@ -114,10 +114,10 @@
114 </ProjectReference> 114 </ProjectReference>
115 </ItemGroup> 115 </ItemGroup>
116 <ItemGroup> 116 <ItemGroup>
117 <Compile Include="GridManager.cs"> 117 <Compile Include="Main.cs">
118 <SubType>Code</SubType> 118 <SubType>Code</SubType>
119 </Compile> 119 </Compile>
120 <Compile Include="Main.cs"> 120 <Compile Include="GridManager.cs">
121 <SubType>Code</SubType> 121 <SubType>Code</SubType>
122 </Compile> 122 </Compile>
123 <Compile Include="Properties\AssemblyInfo.cs"> 123 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
index 4cadf1d..45cf353 100644
--- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
+++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="GridManager.cs" />
15 <include name="Main.cs" /> 14 <include name="Main.cs" />
15 <include name="GridManager.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 4610a9d..4216515 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenSim.Framework.Data; 31using OpenSim.Framework.Data;
32using OpenSim.Framework.Sims;
33using OpenSim.Framework.UserManagement; 32using OpenSim.Framework.UserManagement;
34 33
35namespace OpenSim.Grid.UserServer 34namespace OpenSim.Grid.UserServer
@@ -48,23 +47,23 @@ namespace OpenSim.Grid.UserServer
48 public override void CustomiseResponse( LoginResponse response, UserProfileData theUser) 47 public override void CustomiseResponse( LoginResponse response, UserProfileData theUser)
49 { 48 {
50 // Load information from the gridserver 49 // Load information from the gridserver
51 SimProfile SimInfo = new SimProfile(); 50 SimProfileData SimInfo = new SimProfileData();
52 SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey); 51 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
53 52
54 // Customise the response 53 // Customise the response
55 // Home Location 54 // Home Location
56 response.Home = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " + 55 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +
57 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + 56 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
58 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 57 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
59 58
60 // Destination 59 // Destination
61 response.SimAddress = SimInfo.sim_ip; 60 response.SimAddress = SimInfo.serverIP;
62 response.SimPort = (Int32)SimInfo.sim_port; 61 response.SimPort = (Int32)SimInfo.serverPort;
63 response.RegionX = SimInfo.RegionLocY ; 62 response.RegionX = SimInfo.regionLocX;
64 response.RegionY = SimInfo.RegionLocX ; 63 response.RegionY = SimInfo.regionLocX;
65 64
66 // Notify the target of an incoming user 65 // Notify the target of an incoming user
67 Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")"); 66 Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")");
68 67
69 // Prepare notification 68 // Prepare notification
70 Hashtable SimParams = new Hashtable(); 69 Hashtable SimParams = new Hashtable();
@@ -83,11 +82,11 @@ namespace OpenSim.Grid.UserServer
83 82
84 // Update agent with target sim 83 // Update agent with target sim
85 theUser.currentAgent.currentRegion = SimInfo.UUID; 84 theUser.currentAgent.currentRegion = SimInfo.UUID;
86 theUser.currentAgent.currentHandle = SimInfo.regionhandle; 85 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
87 86
88 // Send 87 // Send
89 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 88 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
90 XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000); 89 XmlRpcResponse GridResp = GridReq.Send(SimInfo.serverURI, 3000);
91 } 90 }
92 } 91 }
93} 92}
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>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index c8b859c..f332827 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,9 +83,6 @@
83 <Compile Include="Prebuild.cs"> 83 <Compile Include="Prebuild.cs">
84 <SubType>Code</SubType> 84 <SubType>Code</SubType>
85 </Compile> 85 </Compile>
86 <Compile Include="Core\FatalException.cs">
87 <SubType>Code</SubType>
88 </Compile>
89 <Compile Include="Core\Kernel.cs"> 86 <Compile Include="Core\Kernel.cs">
90 <SubType>Code</SubType> 87 <SubType>Code</SubType>
91 </Compile> 88 </Compile>
@@ -95,19 +92,25 @@
95 <Compile Include="Core\WarningException.cs"> 92 <Compile Include="Core\WarningException.cs">
96 <SubType>Code</SubType> 93 <SubType>Code</SubType>
97 </Compile> 94 </Compile>
98 <Compile Include="Core\Attributes\DataNodeAttribute.cs"> 95 <Compile Include="Core\FatalException.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="Core\Interfaces\ITarget.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 <Compile Include="Core\Interfaces\IDataNode.cs">
99 <SubType>Code</SubType> 102 <SubType>Code</SubType>
100 </Compile> 103 </Compile>
101 <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> 104 <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
102 <SubType>Code</SubType> 105 <SubType>Code</SubType>
103 </Compile> 106 </Compile>
104 <Compile Include="Core\Attributes\TargetAttribute.cs"> 107 <Compile Include="Core\Attributes\DataNodeAttribute.cs">
105 <SubType>Code</SubType> 108 <SubType>Code</SubType>
106 </Compile> 109 </Compile>
107 <Compile Include="Core\Interfaces\IDataNode.cs"> 110 <Compile Include="Core\Attributes\TargetAttribute.cs">
108 <SubType>Code</SubType> 111 <SubType>Code</SubType>
109 </Compile> 112 </Compile>
110 <Compile Include="Core\Interfaces\ITarget.cs"> 113 <Compile Include="Core\Nodes\ProjectNode.cs">
111 <SubType>Code</SubType> 114 <SubType>Code</SubType>
112 </Compile> 115 </Compile>
113 <Compile Include="Core\Nodes\ConfigurationNode.cs"> 116 <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -119,76 +122,73 @@
119 <Compile Include="Core\Nodes\ExcludeNode.cs"> 122 <Compile Include="Core\Nodes\ExcludeNode.cs">
120 <SubType>Code</SubType> 123 <SubType>Code</SubType>
121 </Compile> 124 </Compile>
122 <Compile Include="Core\Nodes\FileNode.cs"> 125 <Compile Include="Core\Nodes\OptionsNode.cs">
123 <SubType>Code</SubType> 126 <SubType>Code</SubType>
124 </Compile> 127 </Compile>
125 <Compile Include="Core\Nodes\FilesNode.cs"> 128 <Compile Include="Core\Nodes\ReferencePathNode.cs">
126 <SubType>Code</SubType> 129 <SubType>Code</SubType>
127 </Compile> 130 </Compile>
128 <Compile Include="Core\Nodes\MatchNode.cs"> 131 <Compile Include="Core\Nodes\MatchNode.cs">
129 <SubType>Code</SubType> 132 <SubType>Code</SubType>
130 </Compile> 133 </Compile>
131 <Compile Include="Core\Nodes\OptionsNode.cs"> 134 <Compile Include="Core\Nodes\SolutionNode.cs">
132 <SubType>Code</SubType> 135 <SubType>Code</SubType>
133 </Compile> 136 </Compile>
134 <Compile Include="Core\Nodes\ProcessNode.cs"> 137 <Compile Include="Core\Nodes\ProcessNode.cs">
135 <SubType>Code</SubType> 138 <SubType>Code</SubType>
136 </Compile> 139 </Compile>
137 <Compile Include="Core\Nodes\ProjectNode.cs">
138 <SubType>Code</SubType>
139 </Compile>
140 <Compile Include="Core\Nodes\ReferenceNode.cs"> 140 <Compile Include="Core\Nodes\ReferenceNode.cs">
141 <SubType>Code</SubType> 141 <SubType>Code</SubType>
142 </Compile> 142 </Compile>
143 <Compile Include="Core\Nodes\ReferencePathNode.cs"> 143 <Compile Include="Core\Nodes\FileNode.cs">
144 <SubType>Code</SubType> 144 <SubType>Code</SubType>
145 </Compile> 145 </Compile>
146 <Compile Include="Core\Nodes\SolutionNode.cs"> 146 <Compile Include="Core\Nodes\FilesNode.cs">
147 <SubType>Code</SubType> 147 <SubType>Code</SubType>
148 </Compile> 148 </Compile>
149 <Compile Include="Core\Parse\IfContext.cs"> 149 <Compile Include="Core\Targets\DebugTarget.cs">
150 <SubType>Code</SubType> 150 <SubType>Code</SubType>
151 </Compile> 151 </Compile>
152 <Compile Include="Core\Parse\Preprocessor.cs"> 152 <Compile Include="Core\Targets\MonoDevelopTarget.cs">
153 <SubType>Code</SubType> 153 <SubType>Code</SubType>
154 </Compile> 154 </Compile>
155 <Compile Include="Core\Targets\AutotoolsTarget.cs"> 155 <Compile Include="Core\Targets\AutotoolsTarget.cs">
156 <SubType>Code</SubType> 156 <SubType>Code</SubType>
157 </Compile> 157 </Compile>
158 <Compile Include="Core\Targets\DebugTarget.cs"> 158 <Compile Include="Core\Targets\SharpDevelopTarget.cs">
159 <SubType>Code</SubType> 159 <SubType>Code</SubType>
160 </Compile> 160 </Compile>
161 <Compile Include="Core\Targets\MonoDevelopTarget.cs"> 161 <Compile Include="Core\Targets\VS2002Target.cs">
162 <SubType>Code</SubType> 162 <SubType>Code</SubType>
163 </Compile> 163 </Compile>
164 <Compile Include="Core\Targets\NAntTarget.cs"> 164 <Compile Include="Core\Targets\VS2003Target.cs">
165 <SubType>Code</SubType> 165 <SubType>Code</SubType>
166 </Compile> 166 </Compile>
167 <Compile Include="Core\Targets\SharpDevelop2Target.cs"> 167 <Compile Include="Core\Targets\SharpDevelop2Target.cs">
168 <SubType>Code</SubType> 168 <SubType>Code</SubType>
169 </Compile> 169 </Compile>
170 <Compile Include="Core\Targets\SharpDevelopTarget.cs"> 170 <Compile Include="Core\Targets\VS2005Target.cs">
171 <SubType>Code</SubType> 171 <SubType>Code</SubType>
172 </Compile> 172 </Compile>
173 <Compile Include="Core\Targets\VS2002Target.cs"> 173 <Compile Include="Core\Targets\NAntTarget.cs">
174 <SubType>Code</SubType> 174 <SubType>Code</SubType>
175 </Compile> 175 </Compile>
176 <Compile Include="Core\Targets\VS2003Target.cs"> 176 <Compile Include="Core\Parse\IfContext.cs">
177 <SubType>Code</SubType> 177 <SubType>Code</SubType>
178 </Compile> 178 </Compile>
179 <Compile Include="Core\Targets\VS2005Target.cs"> 179 <Compile Include="Core\Parse\Preprocessor.cs">
180 <SubType>Code</SubType> 180 <SubType>Code</SubType>
181 </Compile> 181 </Compile>
182 <Compile Include="Core\Utilities\CommandLineCollection.cs"> 182 <Compile Include="Core\Utilities\Helper.cs">
183 <SubType>Code</SubType> 183 <SubType>Code</SubType>
184 </Compile> 184 </Compile>
185 <Compile Include="Core\Utilities\CurrentDirectory.cs"> 185 <Compile Include="Core\Utilities\Log.cs">
186 <SubType>Code</SubType> 186 <SubType>Code</SubType>
187 </Compile> 187 </Compile>
188 <Compile Include="Core\Utilities\Helper.cs"> 188 <Compile Include="Core\Utilities\CommandLineCollection.cs">
189 <SubType>Code</SubType> 189 <SubType>Code</SubType>
190 </Compile> 190 </Compile>
191 <Compile Include="Core\Utilities\Log.cs"> 191 <Compile Include="Core\Utilities\CurrentDirectory.cs">
192 <SubType>Code</SubType> 192 <SubType>Code</SubType>
193 </Compile> 193 </Compile>
194 <Compile Include="Properties\AssemblyInfo.cs"> 194 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 2851125..52dd1a7 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
14 </resources> 14 </resources>
15 <sources failonempty="true"> 15 <sources failonempty="true">
16 <include name="Prebuild.cs" /> 16 <include name="Prebuild.cs" />
17 <include name="Core/FatalException.cs" />
18 <include name="Core/Kernel.cs" /> 17 <include name="Core/Kernel.cs" />
19 <include name="Core/UnknownLanguageException.cs" /> 18 <include name="Core/UnknownLanguageException.cs" />
20 <include name="Core/WarningException.cs" /> 19 <include name="Core/WarningException.cs" />
21 <include name="Core/Attributes/DataNodeAttribute.cs" /> 20 <include name="Core/FatalException.cs" />
21 <include name="Core/Interfaces/ITarget.cs" />
22 <include name="Core/Interfaces/IDataNode.cs" />
22 <include name="Core/Attributes/OptionNodeAttribute.cs" /> 23 <include name="Core/Attributes/OptionNodeAttribute.cs" />
24 <include name="Core/Attributes/DataNodeAttribute.cs" />
23 <include name="Core/Attributes/TargetAttribute.cs" /> 25 <include name="Core/Attributes/TargetAttribute.cs" />
24 <include name="Core/Interfaces/IDataNode.cs" /> 26 <include name="Core/Nodes/ProjectNode.cs" />
25 <include name="Core/Interfaces/ITarget.cs" />
26 <include name="Core/Nodes/ConfigurationNode.cs" /> 27 <include name="Core/Nodes/ConfigurationNode.cs" />
27 <include name="Core/Nodes/DataNode.cs" /> 28 <include name="Core/Nodes/DataNode.cs" />
28 <include name="Core/Nodes/ExcludeNode.cs" /> 29 <include name="Core/Nodes/ExcludeNode.cs" />
29 <include name="Core/Nodes/FileNode.cs" />
30 <include name="Core/Nodes/FilesNode.cs" />
31 <include name="Core/Nodes/MatchNode.cs" />
32 <include name="Core/Nodes/OptionsNode.cs" /> 30 <include name="Core/Nodes/OptionsNode.cs" />
33 <include name="Core/Nodes/ProcessNode.cs" />
34 <include name="Core/Nodes/ProjectNode.cs" />
35 <include name="Core/Nodes/ReferenceNode.cs" />
36 <include name="Core/Nodes/ReferencePathNode.cs" /> 31 <include name="Core/Nodes/ReferencePathNode.cs" />
32 <include name="Core/Nodes/MatchNode.cs" />
37 <include name="Core/Nodes/SolutionNode.cs" /> 33 <include name="Core/Nodes/SolutionNode.cs" />
38 <include name="Core/Parse/IfContext.cs" /> 34 <include name="Core/Nodes/ProcessNode.cs" />
39 <include name="Core/Parse/Preprocessor.cs" /> 35 <include name="Core/Nodes/ReferenceNode.cs" />
40 <include name="Core/Targets/AutotoolsTarget.cs" /> 36 <include name="Core/Nodes/FileNode.cs" />
37 <include name="Core/Nodes/FilesNode.cs" />
41 <include name="Core/Targets/DebugTarget.cs" /> 38 <include name="Core/Targets/DebugTarget.cs" />
42 <include name="Core/Targets/MonoDevelopTarget.cs" /> 39 <include name="Core/Targets/MonoDevelopTarget.cs" />
43 <include name="Core/Targets/NAntTarget.cs" /> 40 <include name="Core/Targets/AutotoolsTarget.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" />
45 <include name="Core/Targets/SharpDevelopTarget.cs" /> 41 <include name="Core/Targets/SharpDevelopTarget.cs" />
46 <include name="Core/Targets/VS2002Target.cs" /> 42 <include name="Core/Targets/VS2002Target.cs" />
47 <include name="Core/Targets/VS2003Target.cs" /> 43 <include name="Core/Targets/VS2003Target.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" />
48 <include name="Core/Targets/VS2005Target.cs" /> 45 <include name="Core/Targets/VS2005Target.cs" />
49 <include name="Core/Utilities/CommandLineCollection.cs" /> 46 <include name="Core/Targets/NAntTarget.cs" />
50 <include name="Core/Utilities/CurrentDirectory.cs" /> 47 <include name="Core/Parse/IfContext.cs" />
48 <include name="Core/Parse/Preprocessor.cs" />
51 <include name="Core/Utilities/Helper.cs" /> 49 <include name="Core/Utilities/Helper.cs" />
52 <include name="Core/Utilities/Log.cs" /> 50 <include name="Core/Utilities/Log.cs" />
51 <include name="Core/Utilities/CommandLineCollection.cs" />
52 <include name="Core/Utilities/CurrentDirectory.cs" />
53 <include name="Properties/AssemblyInfo.cs" /> 53 <include name="Properties/AssemblyInfo.cs" />
54 </sources> 54 </sources>
55 <references basedir="${project::get-base-directory()}"> 55 <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index 4078839..777a839 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -434,6 +434,7 @@
434 <Reference name="System" localCopy="false"/> 434 <Reference name="System" localCopy="false"/>
435 <Reference name="System.Xml"/> 435 <Reference name="System.Xml"/>
436 <Reference name="System.Data"/> 436 <Reference name="System.Data"/>
437 <Reference name="XMLRPC.dll"/>
437 <Reference name="libsecondlife.dll"/> 438 <Reference name="libsecondlife.dll"/>
438 <Files> 439 <Files>
439 <Match pattern="*.cs" recurse="true"/> 440 <Match pattern="*.cs" recurse="true"/>
generated by cgit v1.1 at 2024-11-10 01:12:10 +0000