aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-06-28 16:17:20 +0000
committermingchen2007-06-28 16:17:20 +0000
commit108d89f89436556c8f4662197903c374db943f7d (patch)
tree4a089c43c54bdef28c0883fd9aaef464c840c3ac
parentApplied ScenePresence movement patch from Darok. (diff)
downloadopensim-SC_OLD-108d89f89436556c8f4662197903c374db943f7d.zip
opensim-SC_OLD-108d89f89436556c8f4662197903c374db943f7d.tar.gz
opensim-SC_OLD-108d89f89436556c8f4662197903c374db943f7d.tar.bz2
opensim-SC_OLD-108d89f89436556c8f4662197903c374db943f7d.tar.xz
*Master User is now set up
*Added support for getting user profile information from remote grid server (untested) *Updated prebuild.xml
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs3
-rw-r--r--OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj6
-rw-r--r--OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build2
-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.csproj4
-rw-r--r--OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build4
-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.csproj12
-rw-r--r--OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build4
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.csproj60
-rw-r--r--OpenSim/Framework/General/OpenSim.Framework.dll.build36
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs39
-rw-r--r--OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj8
-rw-r--r--OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build6
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj4
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build2
-rw-r--r--OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj4
-rw-r--r--OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build2
-rw-r--r--OpenSim/Region/Application/OpenSim.csproj12
-rw-r--r--OpenSim/Region/Application/OpenSim.exe.build3
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs11
-rw-r--r--OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj20
-rw-r--r--OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build16
-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/CommunicationsLocal.cs2
-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/GridCommsManager.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGSUserServices.cs63
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj4
-rw-r--r--OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build4
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.csproj34
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build26
-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
43 files changed, 339 insertions, 219 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 74d12d2..69b5da6 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -43,9 +43,10 @@ namespace OpenSim.Framework.Communications
43 public IGridServices GridServer; 43 public IGridServices GridServer;
44 public IInterRegionCommunications InterRegion; 44 public IInterRegionCommunications InterRegion;
45 45
46 public NetworkServersInfo ServersInfo;
46 public CommunicationsManager(NetworkServersInfo serversInfo) 47 public CommunicationsManager(NetworkServersInfo serversInfo)
47 { 48 {
48 49 ServersInfo = serversInfo;
49 } 50 }
50 } 51 }
51} 52}
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..66507a8 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,9 +86,6 @@
86 </ProjectReference> 86 </ProjectReference>
87 </ItemGroup> 87 </ItemGroup>
88 <ItemGroup> 88 <ItemGroup>
89 <Compile Include="CommunicationsManager.cs">
90 <SubType>Code</SubType>
91 </Compile>
92 <Compile Include="IGridServices.cs"> 89 <Compile Include="IGridServices.cs">
93 <SubType>Code</SubType> 90 <SubType>Code</SubType>
94 </Compile> 91 </Compile>
@@ -98,6 +95,9 @@
98 <Compile Include="IUserServices.cs"> 95 <Compile Include="IUserServices.cs">
99 <SubType>Code</SubType> 96 <SubType>Code</SubType>
100 </Compile> 97 </Compile>
98 <Compile Include="CommunicationsManager.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 <Compile Include="Properties\AssemblyInfo.cs"> 101 <Compile Include="Properties\AssemblyInfo.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6..1c55d8c 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" />
15 <include name="IGridServices.cs" /> 14 <include name="IGridServices.cs" />
16 <include name="IInterRegionCommunications.cs" /> 15 <include name="IInterRegionCommunications.cs" />
17 <include name="IUserServices.cs" /> 16 <include name="IUserServices.cs" />
17 <include name="CommunicationsManager.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..f6e8311 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="DB4oManager.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="DB4oUserData.cs"> 97 <Compile Include="DB4oGridData.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..2c5e31b 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="DB4oGridData.cs" />
15 <include name="DB4oManager.cs" />
16 <include name="DB4oUserData.cs" /> 14 <include name="DB4oUserData.cs" />
15 <include name="DB4oManager.cs" />
16 <include name="DB4oGridData.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..47b9ba3 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
@@ -78,22 +78,22 @@
78 <ItemGroup> 78 <ItemGroup>
79 </ItemGroup> 79 </ItemGroup>
80 <ItemGroup> 80 <ItemGroup>
81 <Compile Include="GridData.cs"> 81 <Compile Include="ReservationData.cs">
82 <SubType>Code</SubType> 82 <SubType>Code</SubType>
83 </Compile> 83 </Compile>
84 <Compile Include="ILogData.cs"> 84 <Compile Include="GridData.cs">
85 <SubType>Code</SubType> 85 <SubType>Code</SubType>
86 </Compile> 86 </Compile>
87 <Compile Include="IniConfig.cs"> 87 <Compile Include="SimProfileData.cs">
88 <SubType>Code</SubType> 88 <SubType>Code</SubType>
89 </Compile> 89 </Compile>
90 <Compile Include="InventoryData.cs"> 90 <Compile Include="ILogData.cs">
91 <SubType>Code</SubType> 91 <SubType>Code</SubType>
92 </Compile> 92 </Compile>
93 <Compile Include="ReservationData.cs"> 93 <Compile Include="IniConfig.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="SimProfileData.cs"> 96 <Compile Include="InventoryData.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="UserData.cs"> 99 <Compile Include="UserData.cs">
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
index aefb02b..881bb3a 100644
--- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
+++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
@@ -11,12 +11,12 @@
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" />
16 <include name="SimProfileData.cs" />
15 <include name="ILogData.cs" /> 17 <include name="ILogData.cs" />
16 <include name="IniConfig.cs" /> 18 <include name="IniConfig.cs" />
17 <include name="InventoryData.cs" /> 19 <include name="InventoryData.cs" />
18 <include name="ReservationData.cs" />
19 <include name="SimProfileData.cs" />
20 <include name="UserData.cs" /> 20 <include name="UserData.cs" />
21 <include name="UserProfileData.cs" /> 21 <include name="UserProfileData.cs" />
22 <include name="Properties/AssemblyInfo.cs" /> 22 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 48db634..261b96b 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,106 +91,106 @@
91 <Compile Include="AgentInventory.cs"> 91 <Compile Include="AgentInventory.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="AuthenticateSessionBase.cs"> 94 <Compile Include="Util.cs">
95 <SubType>Code</SubType>
96 </Compile>
97 <Compile Include="BlockingQueue.cs">
98 <SubType>Code</SubType> 95 <SubType>Code</SubType>
99 </Compile> 96 </Compile>
100 <Compile Include="IRegionCommsListener.cs"> 97 <Compile Include="AuthenticateSessionBase.cs">
101 <SubType>Code</SubType> 98 <SubType>Code</SubType>
102 </Compile> 99 </Compile>
103 <Compile Include="Logger.cs"> 100 <Compile Include="Logger.cs">
104 <SubType>Code</SubType> 101 <SubType>Code</SubType>
105 </Compile> 102 </Compile>
106 <Compile Include="LoginService.cs"> 103 <Compile Include="Remoting.cs">
107 <SubType>Code</SubType> 104 <SubType>Code</SubType>
108 </Compile> 105 </Compile>
109 <Compile Include="RegionCommsListener.cs"> 106 <Compile Include="RegionCommsListener.cs">
110 <SubType>Code</SubType> 107 <SubType>Code</SubType>
111 </Compile> 108 </Compile>
112 <Compile Include="Remoting.cs"> 109 <Compile Include="LoginService.cs">
113 <SubType>Code</SubType> 110 <SubType>Code</SubType>
114 </Compile> 111 </Compile>
115 <Compile Include="SimProfile.cs"> 112 <Compile Include="BlockingQueue.cs">
116 <SubType>Code</SubType> 113 <SubType>Code</SubType>
117 </Compile> 114 </Compile>
118 <Compile Include="UserProfile.cs"> 115 <Compile Include="UserProfile.cs">
119 <SubType>Code</SubType> 116 <SubType>Code</SubType>
120 </Compile> 117 </Compile>
121 <Compile Include="Util.cs"> 118 <Compile Include="IRegionCommsListener.cs">
119 <SubType>Code</SubType>
120 </Compile>
121 <Compile Include="SimProfile.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="Interfaces\AuthenticateResponse.cs"> 124 <Compile Include="Interfaces\AuthenticateResponse.cs">
125 <SubType>Code</SubType> 125 <SubType>Code</SubType>
126 </Compile> 126 </Compile>
127 <Compile Include="Interfaces\IAssetServer.cs"> 127 <Compile Include="Interfaces\IUserServer.cs">
128 <SubType>Code</SubType> 128 <SubType>Code</SubType>
129 </Compile> 129 </Compile>
130 <Compile Include="Interfaces\IClientAPI.cs"> 130 <Compile Include="Interfaces\IAssetServer.cs">
131 <SubType>Code</SubType> 131 <SubType>Code</SubType>
132 </Compile> 132 </Compile>
133 <Compile Include="Interfaces\ILocalStorage.cs"> 133 <Compile Include="Interfaces\IWorld.cs">
134 <SubType>Code</SubType> 134 <SubType>Code</SubType>
135 </Compile> 135 </Compile>
136 <Compile Include="Interfaces\IUserServer.cs"> 136 <Compile Include="Interfaces\IClientAPI.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="Interfaces\IWorld.cs"> 139 <Compile Include="Interfaces\ILocalStorage.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </Compile>
142 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 142 <Compile Include="Interfaces\Config\IGenericConfig.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="Interfaces\Config\IGridConfig.cs"> 145 <Compile Include="Interfaces\Config\IUserConfig.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </Compile>
148 <Compile Include="Interfaces\Config\IUserConfig.cs"> 148 <Compile Include="Interfaces\Config\IGridConfig.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="Properties\AssemblyInfo.cs"> 151 <Compile Include="Properties\AssemblyInfo.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="Types\AgentCiruitData.cs"> 154 <Compile Include="Types\NeighbourInfo.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="Types\AgentWearable.cs"> 157 <Compile Include="Types\RegionHandle.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="Types\AssetBase.cs"> 160 <Compile Include="Types\RegionInfo.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="Types\AssetLandmark.cs"> 163 <Compile Include="Types\ParcelData.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="Types\AssetStorage.cs"> 166 <Compile Include="Types\AgentWearable.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Types\EstateSettings.cs"> 169 <Compile Include="Types\PrimData.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="Types\Login.cs"> 172 <Compile Include="Types\MapBlockData.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="Types\MapBlockData.cs"> 175 <Compile Include="Types\AssetStorage.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="Types\NeighbourInfo.cs"> 178 <Compile Include="Types\EstateSettings.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="Types\NetworkServersInfo.cs"> 181 <Compile Include="Types\AgentCiruitData.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="Types\ParcelData.cs"> 184 <Compile Include="Types\Login.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 <Compile Include="Types\PrimData.cs"> 187 <Compile Include="Types\AssetLandmark.cs">
188 <SubType>Code</SubType> 188 <SubType>Code</SubType>
189 </Compile> 189 </Compile>
190 <Compile Include="Types\RegionHandle.cs"> 190 <Compile Include="Types\AssetBase.cs">
191 <SubType>Code</SubType> 191 <SubType>Code</SubType>
192 </Compile> 192 </Compile>
193 <Compile Include="Types\RegionInfo.cs"> 193 <Compile Include="Types\NetworkServersInfo.cs">
194 <SubType>Code</SubType> 194 <SubType>Code</SubType>
195 </Compile> 195 </Compile>
196 </ItemGroup> 196 </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index a18838b..f05217f 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -12,40 +12,40 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
15 <include name="Util.cs" />
15 <include name="AuthenticateSessionBase.cs" /> 16 <include name="AuthenticateSessionBase.cs" />
16 <include name="BlockingQueue.cs" />
17 <include name="IRegionCommsListener.cs" />
18 <include name="Logger.cs" /> 17 <include name="Logger.cs" />
19 <include name="LoginService.cs" />
20 <include name="RegionCommsListener.cs" />
21 <include name="Remoting.cs" /> 18 <include name="Remoting.cs" />
22 <include name="SimProfile.cs" /> 19 <include name="RegionCommsListener.cs" />
20 <include name="LoginService.cs" />
21 <include name="BlockingQueue.cs" />
23 <include name="UserProfile.cs" /> 22 <include name="UserProfile.cs" />
24 <include name="Util.cs" /> 23 <include name="IRegionCommsListener.cs" />
24 <include name="SimProfile.cs" />
25 <include name="Interfaces/AuthenticateResponse.cs" /> 25 <include name="Interfaces/AuthenticateResponse.cs" />
26 <include name="Interfaces/IUserServer.cs" />
26 <include name="Interfaces/IAssetServer.cs" /> 27 <include name="Interfaces/IAssetServer.cs" />
28 <include name="Interfaces/IWorld.cs" />
27 <include name="Interfaces/IClientAPI.cs" /> 29 <include name="Interfaces/IClientAPI.cs" />
28 <include name="Interfaces/ILocalStorage.cs" /> 30 <include name="Interfaces/ILocalStorage.cs" />
29 <include name="Interfaces/IUserServer.cs" />
30 <include name="Interfaces/IWorld.cs" />
31 <include name="Interfaces/Config/IGenericConfig.cs" /> 31 <include name="Interfaces/Config/IGenericConfig.cs" />
32 <include name="Interfaces/Config/IGridConfig.cs" />
33 <include name="Interfaces/Config/IUserConfig.cs" /> 32 <include name="Interfaces/Config/IUserConfig.cs" />
33 <include name="Interfaces/Config/IGridConfig.cs" />
34 <include name="Properties/AssemblyInfo.cs" /> 34 <include name="Properties/AssemblyInfo.cs" />
35 <include name="Types/AgentCiruitData.cs" /> 35 <include name="Types/NeighbourInfo.cs" />
36 <include name="Types/RegionHandle.cs" />
37 <include name="Types/RegionInfo.cs" />
38 <include name="Types/ParcelData.cs" />
36 <include name="Types/AgentWearable.cs" /> 39 <include name="Types/AgentWearable.cs" />
37 <include name="Types/AssetBase.cs" /> 40 <include name="Types/PrimData.cs" />
38 <include name="Types/AssetLandmark.cs" /> 41 <include name="Types/MapBlockData.cs" />
39 <include name="Types/AssetStorage.cs" /> 42 <include name="Types/AssetStorage.cs" />
40 <include name="Types/EstateSettings.cs" /> 43 <include name="Types/EstateSettings.cs" />
44 <include name="Types/AgentCiruitData.cs" />
41 <include name="Types/Login.cs" /> 45 <include name="Types/Login.cs" />
42 <include name="Types/MapBlockData.cs" /> 46 <include name="Types/AssetLandmark.cs" />
43 <include name="Types/NeighbourInfo.cs" /> 47 <include name="Types/AssetBase.cs" />
44 <include name="Types/NetworkServersInfo.cs" /> 48 <include name="Types/NetworkServersInfo.cs" />
45 <include name="Types/ParcelData.cs" />
46 <include name="Types/PrimData.cs" />
47 <include name="Types/RegionHandle.cs" />
48 <include name="Types/RegionInfo.cs" />
49 </sources> 49 </sources>
50 <references basedir="${project::get-base-directory()}"> 50 <references basedir="${project::get-base-directory()}">
51 <lib> 51 <lib>
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d7811..c6b81a7 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
156 this.GridRecvKey = attri; 156 this.GridRecvKey = attri;
157 } 157 }
158 158
159 //Grid Server
160 attri = "";
161 attri = configData.GetAttribute("UserServerURL");
162 if (attri == "")
163 {
164 this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
165 configData.SetAttribute("UserServerURL", this.UserURL);
166 }
167 else
168 {
169 this.UserURL = attri;
170 }
171
172 //Grid Send Key
173 attri = "";
174 attri = configData.GetAttribute("UserSendKey");
175 if (attri == "")
176 {
177 this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
178 configData.SetAttribute("UserSendKey", this.UserSendKey);
179 }
180 else
181 {
182 this.UserSendKey = attri;
183 }
184
185 //Grid Receive Key
186 attri = "";
187 attri = configData.GetAttribute("UserRecvKey");
188 if (attri == "")
189 {
190 this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
191 configData.SetAttribute("GridRecvKey", this.UserRecvKey);
192 }
193 else
194 {
195 this.UserRecvKey = attri;
196 }
197
159 attri = ""; 198 attri = "";
160 attri = configData.GetAttribute("AssetServerURL"); 199 attri = configData.GetAttribute("AssetServerURL");
161 if (attri == "") 200 if (attri == "")
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
index 399f456..2301fa6 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
@@ -90,19 +90,19 @@
90 </ProjectReference> 90 </ProjectReference>
91 </ItemGroup> 91 </ItemGroup>
92 <ItemGroup> 92 <ItemGroup>
93 <Compile Include="BaseHttpServer.cs"> 93 <Compile Include="IRestHandler.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="CheckSumServer.cs"> 96 <Compile Include="XmlRpcMethod.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="IRestHandler.cs"> 99 <Compile Include="CheckSumServer.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="UDPServerBase.cs"> 102 <Compile Include="UDPServerBase.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="XmlRpcMethod.cs"> 105 <Compile Include="BaseHttpServer.cs">
106 <SubType>Code</SubType> 106 <SubType>Code</SubType>
107 </Compile> 107 </Compile>
108 </ItemGroup> 108 </ItemGroup>
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
index 7401b07..bb20780 100644
--- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
+++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
@@ -11,11 +11,11 @@
11 <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="BaseHttpServer.cs" />
15 <include name="CheckSumServer.cs" />
16 <include name="IRestHandler.cs" /> 14 <include name="IRestHandler.cs" />
17 <include name="UDPServerBase.cs" />
18 <include name="XmlRpcMethod.cs" /> 15 <include name="XmlRpcMethod.cs" />
16 <include name="CheckSumServer.cs" />
17 <include name="UDPServerBase.cs" />
18 <include name="BaseHttpServer.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/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca3..945b7a5 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
98 <ItemGroup> 98 <ItemGroup>
99 </ItemGroup> 99 </ItemGroup>
100 <ItemGroup> 100 <ItemGroup>
101 <Compile Include="AssetHttpServer.cs"> 101 <Compile Include="Main.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="Main.cs"> 104 <Compile Include="AssetHttpServer.cs">
105 <SubType>Code</SubType> 105 <SubType>Code</SubType>
106 </Compile> 106 </Compile>
107 <Compile Include="Properties\AssemblyInfo.cs"> 107 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 88724f6..0a1b533 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssetHttpServer.cs" />
15 <include name="Main.cs" /> 14 <include name="Main.cs" />
15 <include name="AssetHttpServer.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/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
index 1146b17..e822c18 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
@@ -114,10 +114,10 @@
114 </ProjectReference> 114 </ProjectReference>
115 </ItemGroup> 115 </ItemGroup>
116 <ItemGroup> 116 <ItemGroup>
117 <Compile Include="Main.cs"> 117 <Compile Include="UserManager.cs">
118 <SubType>Code</SubType> 118 <SubType>Code</SubType>
119 </Compile> 119 </Compile>
120 <Compile Include="UserManager.cs"> 120 <Compile Include="Main.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/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
index 50c9788..b0333f1 100644
--- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
+++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Main.cs" />
15 <include name="UserManager.cs" /> 14 <include name="UserManager.cs" />
15 <include name="Main.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/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 5cefa96..f5da23d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -102,6 +102,12 @@
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 103 <Private>False</Private>
104 </ProjectReference> 104 </ProjectReference>
105 <ProjectReference Include="..\..\Framework\Data\OpenSim.Framework.Data.csproj">
106 <Name>OpenSim.Framework.Data</Name>
107 <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private>
110 </ProjectReference>
105 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> 111 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
106 <Name>OpenSim.Framework.GenericConfig.Xml</Name> 112 <Name>OpenSim.Framework.GenericConfig.Xml</Name>
107 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> 113 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
@@ -164,13 +170,13 @@
164 </ProjectReference> 170 </ProjectReference>
165 </ItemGroup> 171 </ItemGroup>
166 <ItemGroup> 172 <ItemGroup>
167 <Compile Include="Application.cs"> 173 <Compile Include="VersionInfo.cs">
168 <SubType>Code</SubType> 174 <SubType>Code</SubType>
169 </Compile> 175 </Compile>
170 <Compile Include="OpenSimMain.cs"> 176 <Compile Include="Application.cs">
171 <SubType>Code</SubType> 177 <SubType>Code</SubType>
172 </Compile> 178 </Compile>
173 <Compile Include="VersionInfo.cs"> 179 <Compile Include="OpenSimMain.cs">
174 <SubType>Code</SubType> 180 <SubType>Code</SubType>
175 </Compile> 181 </Compile>
176 </ItemGroup> 182 </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 74eee5b..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>
@@ -26,6 +26,7 @@
26 <include name="../../../bin/OpenSim.Framework.dll" /> 26 <include name="../../../bin/OpenSim.Framework.dll" />
27 <include name="../../../bin/OpenSim.Framework.Communications.dll" /> 27 <include name="../../../bin/OpenSim.Framework.Communications.dll" />
28 <include name="../../../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../../../bin/OpenSim.Framework.Console.dll" />
29 <include name="../../../bin/OpenSim.Framework.Data.dll" />
29 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" /> 30 <include name="../../../bin/OpenSim.Framework.GenericConfig.Xml.dll" />
30 <include name="../../../bin/OpenSim.Framework.Servers.dll" /> 31 <include name="../../../bin/OpenSim.Framework.Servers.dll" />
31 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" /> 32 <include name="../../../bin/OpenSim.Framework.UserManagement.dll" />
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7bf6b8d..6e600b8 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -42,6 +42,8 @@ using OpenSim.Region.Environment;
42using OpenSim.Region.Environment.Scenes; 42using OpenSim.Region.Environment.Scenes;
43using OpenSim.Region.Terrain; 43using OpenSim.Region.Terrain;
44using OpenSim.Framework.Interfaces; 44using OpenSim.Framework.Interfaces;
45using OpenSim.Framework.Data;
46
45using OpenSim.Framework.Types; 47using OpenSim.Framework.Types;
46using OpenSim.Framework; 48using OpenSim.Framework;
47using OpenSim.Assets; 49using OpenSim.Assets;
@@ -250,7 +252,14 @@ namespace OpenSim
250 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); 252 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
251 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); 253 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
252 LocalWorld.LoadPrimsFromStorage(); 254 LocalWorld.LoadPrimsFromStorage();
253 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager); 255
256 //Master Avatar Setup
257 UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
258 if (masterAvatar != null)
259 {
260 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
261 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
262 }
254 263
255 264
256 LocalWorld.StartTimer(); 265 LocalWorld.StartTimer();
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 4667d52..1ed28d2 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
96 </ProjectReference> 96 </ProjectReference>
97 </ItemGroup> 97 </ItemGroup>
98 <ItemGroup> 98 <ItemGroup>
99 <Compile Include="Caps.cs"> 99 <Compile Include="LLSDCapsDetails.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="LLSDArray.cs"> 102 <Compile Include="LLSDArray.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="LLSDCapEvent.cs"> 105 <Compile Include="LLSDEmpty.cs">
106 <SubType>Code</SubType> 106 <SubType>Code</SubType>
107 </Compile> 107 </Compile>
108 <Compile Include="LLSDCapsDetails.cs"> 108 <Compile Include="LLSDTest.cs">
109 <SubType>Code</SubType> 109 <SubType>Code</SubType>
110 </Compile> 110 </Compile>
111 <Compile Include="LLSDEmpty.cs"> 111 <Compile Include="LLSDUploadReply.cs">
112 <SubType>Code</SubType> 112 <SubType>Code</SubType>
113 </Compile> 113 </Compile>
114 <Compile Include="LLSDHelpers.cs"> 114 <Compile Include="LLSDType.cs">
115 <SubType>Code</SubType> 115 <SubType>Code</SubType>
116 </Compile> 116 </Compile>
117 <Compile Include="LLSDMapLayer.cs"> 117 <Compile Include="LLSDHelpers.cs">
118 <SubType>Code</SubType> 118 <SubType>Code</SubType>
119 </Compile> 119 </Compile>
120 <Compile Include="LLSDMapLayerResponse.cs"> 120 <Compile Include="LLSDCapEvent.cs">
121 <SubType>Code</SubType> 121 <SubType>Code</SubType>
122 </Compile> 122 </Compile>
123 <Compile Include="LLSDMapRequest.cs"> 123 <Compile Include="LLSDMapRequest.cs">
124 <SubType>Code</SubType> 124 <SubType>Code</SubType>
125 </Compile> 125 </Compile>
126 <Compile Include="LLSDTest.cs"> 126 <Compile Include="Caps.cs">
127 <SubType>Code</SubType> 127 <SubType>Code</SubType>
128 </Compile> 128 </Compile>
129 <Compile Include="LLSDType.cs"> 129 <Compile Include="LLSDMapLayerResponse.cs">
130 <SubType>Code</SubType> 130 <SubType>Code</SubType>
131 </Compile> 131 </Compile>
132 <Compile Include="LLSDUploadReply.cs"> 132 <Compile Include="LLSDMapLayer.cs">
133 <SubType>Code</SubType> 133 <SubType>Code</SubType>
134 </Compile> 134 </Compile>
135 </ItemGroup> 135 </ItemGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index a091b5c..dd853e7 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
11 <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Caps.cs" />
15 <include name="LLSDArray.cs" />
16 <include name="LLSDCapEvent.cs" />
17 <include name="LLSDCapsDetails.cs" /> 14 <include name="LLSDCapsDetails.cs" />
15 <include name="LLSDArray.cs" />
18 <include name="LLSDEmpty.cs" /> 16 <include name="LLSDEmpty.cs" />
19 <include name="LLSDHelpers.cs" />
20 <include name="LLSDMapLayer.cs" />
21 <include name="LLSDMapLayerResponse.cs" />
22 <include name="LLSDMapRequest.cs" />
23 <include name="LLSDTest.cs" /> 17 <include name="LLSDTest.cs" />
24 <include name="LLSDType.cs" />
25 <include name="LLSDUploadReply.cs" /> 18 <include name="LLSDUploadReply.cs" />
19 <include name="LLSDType.cs" />
20 <include name="LLSDHelpers.cs" />
21 <include name="LLSDCapEvent.cs" />
22 <include name="LLSDMapRequest.cs" />
23 <include name="Caps.cs" />
24 <include name="LLSDMapLayerResponse.cs" />
25 <include name="LLSDMapLayer.cs" />
26 </sources> 26 </sources>
27 <references basedir="${project::get-base-directory()}"> 27 <references basedir="${project::get-base-directory()}">
28 <lib> 28 <lib>
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/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index f5aa8ae..bacaa3e 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Communications.Local
45 public CommunicationsLocal(NetworkServersInfo serversInfo) 45 public CommunicationsLocal(NetworkServersInfo serversInfo)
46 : base(serversInfo) 46 : base(serversInfo)
47 { 47 {
48 UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY); 48 UserServices = new LocalUserServices(this,this.ServersInfo.DefaultHomeLocX,this.ServersInfo.DefaultHomeLocY);
49 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll"); 49 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
50 UserServer = UserServices; 50 UserServer = UserServices;
51 GridServer = SandBoxServices; 51 GridServer = SandBoxServices;
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49..200fa3a 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
98 </ProjectReference> 98 </ProjectReference>
99 </ItemGroup> 99 </ItemGroup>
100 <ItemGroup> 100 <ItemGroup>
101 <Compile Include="CommunicationsLocal.cs">
102 <SubType>Code</SubType>
103 </Compile>
104 <Compile Include="LocalBackEndServices.cs"> 101 <Compile Include="LocalBackEndServices.cs">
105 <SubType>Code</SubType> 102 <SubType>Code</SubType>
106 </Compile> 103 </Compile>
107 <Compile Include="LocalUserServices.cs"> 104 <Compile Include="LocalUserServices.cs">
108 <SubType>Code</SubType> 105 <SubType>Code</SubType>
109 </Compile> 106 </Compile>
107 <Compile Include="CommunicationsLocal.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="Properties\AssemblyInfo.cs"> 110 <Compile Include="Properties\AssemblyInfo.cs">
111 <SubType>Code</SubType> 111 <SubType>Code</SubType>
112 </Compile> 112 </Compile>
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..60a90bd 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="CommunicationsLocal.cs" />
15 <include name="LocalBackEndServices.cs" /> 14 <include name="LocalBackEndServices.cs" />
16 <include name="LocalUserServices.cs" /> 15 <include name="LocalUserServices.cs" />
16 <include name="CommunicationsLocal.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/GridCommsManager.cs b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
index 77848fa..2bf9536 100644
--- a/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
+++ b/OpenSim/Region/Communications/OGS1/GridCommsManager.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Region.Communications.OGS1
12 { 12 {
13 GridServer = gridInterComms; 13 GridServer = gridInterComms;
14 InterRegion = gridInterComms; 14 InterRegion = gridInterComms;
15 UserServer = new OGSUserServices(); 15 UserServer = new OGSUserServices(this);
16 } 16 }
17 } 17 }
18} 18}
diff --git a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
index 48d3018..d41bdaf 100644
--- a/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGSUserServices.cs
@@ -1,24 +1,87 @@
1using System; 1using System;
2using System.Collections;
2using System.Collections.Generic; 3using System.Collections.Generic;
3using System.Text; 4using System.Text;
5using OpenSim.Framework.Types;
4using OpenSim.Framework.Communications; 6using OpenSim.Framework.Communications;
5using OpenSim.Framework.Data; 7using OpenSim.Framework.Data;
6using libsecondlife; 8using libsecondlife;
7 9
10using Nwc.XmlRpc;
11
8namespace OpenSim.Region.Communications.OGS1 12namespace OpenSim.Region.Communications.OGS1
9{ 13{
10 public class OGSUserServices :IUserServices 14 public class OGSUserServices :IUserServices
11 { 15 {
16 GridCommsManager m_parent;
17 public OGSUserServices(GridCommsManager parent)
18 {
19 m_parent = parent;
20 }
21
22 public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
23 {
24 UserProfileData userData = new UserProfileData();
25 userData.username = (string)data["firstname"];
26 userData.surname = (string)data["lastname"];
27 userData.UUID = new LLUUID((string)data["uuid"]);
28 userData.userInventoryURI = (string)data["server_inventory"];
29 userData.userAssetURI = (string)data["server_asset"];
30 userData.profileFirstText = (string)data["profile_firstlife_about"];
31 userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
32 userData.profileCanDoMask = (uint)data["profile_can_do"];
33 userData.profileWantDoMask = (uint)data["profile_want_do"];
34 userData.profileImage = new LLUUID((string)data["profile_image"]);
35 userData.lastLogin = (int)data["profile_lastlogin"];
36 userData.homeLocation = new LLVector3();
37 userData.homeLookAt = new LLVector3();
38
39 return userData;
40 }
12 public UserProfileData GetUserProfile(string firstName, string lastName) 41 public UserProfileData GetUserProfile(string firstName, string lastName)
13 { 42 {
14 return GetUserProfile(firstName + " " + lastName); 43 return GetUserProfile(firstName + " " + lastName);
15 } 44 }
16 public UserProfileData GetUserProfile(string name) 45 public UserProfileData GetUserProfile(string name)
17 { 46 {
47
48 try
49 {
50 Hashtable param = new Hashtable();
51 param["avatar_name"] = name;
52 IList parameters = new ArrayList();
53 parameters.Add(param);
54 XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
55 XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
56 Hashtable respData = (Hashtable)resp.Value;
57
58 return ConvertXMLRPCDataToUserProfile(respData);
59 }
60 catch (Exception e)
61 {
62 Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
63 }
18 return null; 64 return null;
19 } 65 }
20 public UserProfileData GetUserProfile(LLUUID avatarID) 66 public UserProfileData GetUserProfile(LLUUID avatarID)
21 { 67 {
68 try
69 {
70
71 Hashtable param = new Hashtable();
72 param["avatar_uuid"] = avatarID.ToString();
73 IList parameters = new ArrayList();
74 parameters.Add(param);
75 XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
76 XmlRpcResponse resp = req.Send(m_parent.ServersInfo.UserURL, 3000);
77 Hashtable respData = (Hashtable)resp.Value;
78
79 return ConvertXMLRPCDataToUserProfile(respData);
80 }
81 catch (Exception e)
82 {
83 Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
84 }
22 return null; 85 return null;
23 } 86 }
24 87
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 8cc5641..2124bd9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,13 +116,13 @@
116 </ProjectReference> 116 </ProjectReference>
117 </ItemGroup> 117 </ItemGroup>
118 <ItemGroup> 118 <ItemGroup>
119 <Compile Include="GridCommsManager.cs"> 119 <Compile Include="OGSInterSimComms.cs">
120 <SubType>Code</SubType> 120 <SubType>Code</SubType>
121 </Compile> 121 </Compile>
122 <Compile Include="OGS1GridServices.cs"> 122 <Compile Include="OGS1GridServices.cs">
123 <SubType>Code</SubType> 123 <SubType>Code</SubType>
124 </Compile> 124 </Compile>
125 <Compile Include="OGSInterSimComms.cs"> 125 <Compile Include="GridCommsManager.cs">
126 <SubType>Code</SubType> 126 <SubType>Code</SubType>
127 </Compile> 127 </Compile>
128 <Compile Include="OGSUserServices.cs"> 128 <Compile Include="OGSUserServices.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 21bb15c..1a7cf69 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,9 +11,9 @@
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="GridCommsManager.cs" />
15 <include name="OGS1GridServices.cs" />
16 <include name="OGSInterSimComms.cs" /> 14 <include name="OGSInterSimComms.cs" />
15 <include name="OGS1GridServices.cs" />
16 <include name="GridCommsManager.cs" />
17 <include name="OGSUserServices.cs" /> 17 <include name="OGSUserServices.cs" />
18 <include name="Properties/AssemblyInfo.cs" /> 18 <include name="Properties/AssemblyInfo.cs" />
19 </sources> 19 </sources>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 4069454..9f8d2c3 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -148,64 +148,64 @@
148 </ProjectReference> 148 </ProjectReference>
149 </ItemGroup> 149 </ItemGroup>
150 <ItemGroup> 150 <ItemGroup>
151 <Compile Include="EstateManager.cs"> 151 <Compile Include="RegionManager.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="ParcelManager.cs"> 154 <Compile Include="EstateManager.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="RegionManager.cs"> 157 <Compile Include="ParcelManager.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="Scenes\Entity.cs"> 160 <Compile Include="Scenes\ScenePresence.Body.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="Scenes\IScenePresenceBody.cs"> 163 <Compile Include="Scenes\SceneEvents.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="Scenes\Primitive.cs"> 166 <Compile Include="Scenes\ScenePresence.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Scenes\Scene.cs"> 169 <Compile Include="Scenes\ScenePresence.Animations.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="Scenes\Scene.PacketHandlers.cs"> 172 <Compile Include="Scenes\Scene.PacketHandlers.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="Scenes\SceneBase.cs"> 175 <Compile Include="Scenes\SceneObject.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="Scenes\SceneEvents.cs"> 178 <Compile Include="Scenes\Primitive.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="Scenes\SceneObject.cs"> 181 <Compile Include="Scenes\IScenePresenceBody.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="Scenes\ScenePresence.Animations.cs"> 184 <Compile Include="Scenes\Entity.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 <Compile Include="Scenes\ScenePresence.Body.cs"> 187 <Compile Include="Scenes\SceneBase.cs">
188 <SubType>Code</SubType> 188 <SubType>Code</SubType>
189 </Compile> 189 </Compile>
190 <Compile Include="Scenes\ScenePresence.cs"> 190 <Compile Include="Scenes\Scene.cs">
191 <SubType>Code</SubType> 191 <SubType>Code</SubType>
192 </Compile> 192 </Compile>
193 <Compile Include="Scenes\scripting\Script.cs"> 193 <Compile Include="Scenes\scripting\ScriptManager.cs">
194 <SubType>Code</SubType> 194 <SubType>Code</SubType>
195 </Compile> 195 </Compile>
196 <Compile Include="Scenes\scripting\ScriptInfo.cs"> 196 <Compile Include="Scenes\scripting\ScriptInfo.cs">
197 <SubType>Code</SubType> 197 <SubType>Code</SubType>
198 </Compile> 198 </Compile>
199 <Compile Include="Scenes\scripting\ScriptManager.cs"> 199 <Compile Include="Scenes\scripting\Script.cs">
200 <SubType>Code</SubType> 200 <SubType>Code</SubType>
201 </Compile> 201 </Compile>
202 <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> 202 <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
203 <SubType>Code</SubType> 203 <SubType>Code</SubType>
204 </Compile> 204 </Compile>
205 <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs"> 205 <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
206 <SubType>Code</SubType> 206 <SubType>Code</SubType>
207 </Compile> 207 </Compile>
208 <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs"> 208 <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
209 <SubType>Code</SubType> 209 <SubType>Code</SubType>
210 </Compile> 210 </Compile>
211 </ItemGroup> 211 </ItemGroup>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 51924d5..667f1d7 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,26 +11,26 @@
11 <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > 11 <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="RegionManager.cs" />
14 <include name="EstateManager.cs" /> 15 <include name="EstateManager.cs" />
15 <include name="ParcelManager.cs" /> 16 <include name="ParcelManager.cs" />
16 <include name="RegionManager.cs" />
17 <include name="Scenes/Entity.cs" />
18 <include name="Scenes/IScenePresenceBody.cs" />
19 <include name="Scenes/Primitive.cs" />
20 <include name="Scenes/Scene.cs" />
21 <include name="Scenes/Scene.PacketHandlers.cs" />
22 <include name="Scenes/SceneBase.cs" />
23 <include name="Scenes/SceneEvents.cs" />
24 <include name="Scenes/SceneObject.cs" />
25 <include name="Scenes/ScenePresence.Animations.cs" />
26 <include name="Scenes/ScenePresence.Body.cs" /> 17 <include name="Scenes/ScenePresence.Body.cs" />
18 <include name="Scenes/SceneEvents.cs" />
27 <include name="Scenes/ScenePresence.cs" /> 19 <include name="Scenes/ScenePresence.cs" />
28 <include name="Scenes/scripting/Script.cs" /> 20 <include name="Scenes/ScenePresence.Animations.cs" />
29 <include name="Scenes/scripting/ScriptInfo.cs" /> 21 <include name="Scenes/Scene.PacketHandlers.cs" />
22 <include name="Scenes/SceneObject.cs" />
23 <include name="Scenes/Primitive.cs" />
24 <include name="Scenes/IScenePresenceBody.cs" />
25 <include name="Scenes/Entity.cs" />
26 <include name="Scenes/SceneBase.cs" />
27 <include name="Scenes/Scene.cs" />
30 <include name="Scenes/scripting/ScriptManager.cs" /> 28 <include name="Scenes/scripting/ScriptManager.cs" />
29 <include name="Scenes/scripting/ScriptInfo.cs" />
30 <include name="Scenes/scripting/Script.cs" />
31 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> 31 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
32 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
33 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" /> 32 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
33 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
34 </sources> 34 </sources>
35 <references basedir="${project::get-base-directory()}"> 35 <references basedir="${project::get-base-directory()}">
36 <lib> 36 <lib>
diff --git a/OpenSim/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 1e51bd4..f9e4361 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -667,6 +667,7 @@
667 <Reference name="Db4objects.Db4o.dll"/> 667 <Reference name="Db4objects.Db4o.dll"/>
668 <Reference name="OpenSim.Region.Terrain.BasicTerrain"/> 668 <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
669 <Reference name="OpenSim.Framework"/> 669 <Reference name="OpenSim.Framework"/>
670 <Reference name="OpenSim.Framework.Data"/>
670 <Reference name="OpenSim.Framework.Console"/> 671 <Reference name="OpenSim.Framework.Console"/>
671 <Reference name="OpenSim.Region.Physics.Manager"/> 672 <Reference name="OpenSim.Region.Physics.Manager"/>
672 <Reference name="OpenSim.Framework.Servers"/> 673 <Reference name="OpenSim.Framework.Servers"/>