aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build92
-rw-r--r--OpenGridServices.GridServer/GridHttp.cs110
-rw-r--r--OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build96
-rw-r--r--OpenGridServices.UserServer/Main.cs61
-rw-r--r--OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build94
-rw-r--r--OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build84
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build134
-rw-r--r--OpenSim.Framework/SimProfile.cs35
-rw-r--r--OpenSim.Framework/UserProfileManager.cs8
-rw-r--r--OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build84
-rw-r--r--OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build92
-rw-r--r--OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build90
-rw-r--r--OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build84
-rw-r--r--OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build94
-rw-r--r--OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build86
-rw-r--r--OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build86
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build164
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs1
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs104
-rw-r--r--OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build94
-rw-r--r--OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build92
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build94
-rw-r--r--OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build86
-rw-r--r--OpenSim.build248
-rw-r--r--OpenSim/OpenSim.exe.build96
-rw-r--r--OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build92
-rw-r--r--Prebuild/Prebuild.build134
-rw-r--r--Prebuild/src/Prebuild.exe.build160
-rw-r--r--Servers/OpenSim.Servers.dll.build96
-rw-r--r--bin/OpenSim.Terrain.BasicTerrain.dllbin16384 -> 5632 bytes
-rw-r--r--prebuild.xml3
31 files changed, 1443 insertions, 1351 deletions
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index 61d3efd..73e09ce 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
@@ -1,46 +1,46 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenGrid.Config.GridConfigDb4o" default="build"> 2<project name="OpenGrid.Config.GridConfigDb4o" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" > 11 <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" >
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="DbGridConfig.cs" /> 15 <include name="DbGridConfig.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Data.dll.dll" /> 23 <include name="System.Data.dll.dll" />
24 <include name="System.Xml.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/libsecondlife.dll" /> 25 <include name="../../bin/libsecondlife.dll" />
26 <include name="../../bin/Db4objects.Db4o.dll" /> 26 <include name="../../bin/Db4objects.Db4o.dll" />
27 <include name="../../bin/OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
28 <include name="../../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../../bin/OpenSim.Framework.Console.dll" />
29 </references> 29 </references>
30 </csc> 30 </csc>
31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
32 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 32 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
33 <copy todir="${project::get-base-directory()}/../../bin/"> 33 <copy todir="${project::get-base-directory()}/../../bin/">
34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
35 <include name="*.dll"/> 35 <include name="*.dll"/>
36 <include name="*.exe"/> 36 <include name="*.exe"/>
37 </fileset> 37 </fileset>
38 </copy> 38 </copy>
39 </target> 39 </target>
40 <target name="clean"> 40 <target name="clean">
41 <delete dir="${bin.dir}" failonerror="false" /> 41 <delete dir="${bin.dir}" failonerror="false" />
42 <delete dir="${obj.dir}" failonerror="false" /> 42 <delete dir="${obj.dir}" failonerror="false" />
43 </target> 43 </target>
44 <target name="doc" description="Creates documentation."> 44 <target name="doc" description="Creates documentation.">
45 </target> 45 </target>
46</project> 46</project>
diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs
index 4bc9ef0..ed56b63 100644
--- a/OpenGridServices.GridServer/GridHttp.cs
+++ b/OpenGridServices.GridServer/GridHttp.cs
@@ -57,6 +57,7 @@ namespace OpenGridServices.GridServer
57 MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); 57 MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");
58 Listener = new HttpListener(); 58 Listener = new HttpListener();
59 59
60 Listener.Prefixes.Add("http://+:8001/");
60 Listener.Prefixes.Add("http://+:8001/sims/"); 61 Listener.Prefixes.Add("http://+:8001/sims/");
61 Listener.Prefixes.Add("http://+:8001/gods/"); 62 Listener.Prefixes.Add("http://+:8001/gods/");
62 Listener.Prefixes.Add("http://+:8001/highestuuid/"); 63 Listener.Prefixes.Add("http://+:8001/highestuuid/");
@@ -79,23 +80,30 @@ namespace OpenGridServices.GridServer
79 Hashtable requestData = (Hashtable)request.Params[0]; 80 Hashtable requestData = (Hashtable)request.Params[0];
80 switch(request.MethodName) { 81 switch(request.MethodName) {
81 case "simulator_login": 82 case "simulator_login":
82 if(!(referrer=="simulator")) { 83
84 /*if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) {
83 XmlRpcResponse ErrorResp = new XmlRpcResponse(); 85 XmlRpcResponse ErrorResp = new XmlRpcResponse();
84 Hashtable ErrorRespData = new Hashtable(); 86 Hashtable ErrorRespData = new Hashtable();
85 ErrorRespData["error"]="Only simulators can login with this method"; 87 ErrorRespData["error"]="invalid key";
86 ErrorResp.Value=ErrorRespData; 88 ErrorResp.Value=ErrorRespData;
87 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8")); 89 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
88 } 90 }*/
89 91 SimProfileBase TheSim = null;
90 if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) { 92
93 if(requestData.ContainsKey("UUID")) {
94 TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(new LLUUID((string)requestData["UUID"]));
95 } else if (requestData.ContainsKey("region_handle")){
96 TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(requestData["region_handle"]));
97 }
98
99 if(TheSim==null) {
91 XmlRpcResponse ErrorResp = new XmlRpcResponse(); 100 XmlRpcResponse ErrorResp = new XmlRpcResponse();
92 Hashtable ErrorRespData = new Hashtable(); 101 Hashtable ErrorRespData = new Hashtable();
93 ErrorRespData["error"]="invalid key"; 102 ErrorRespData["error"]="sim not found";
94 ErrorResp.Value=ErrorRespData; 103 ErrorResp.Value=ErrorRespData;
95 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8")); 104 return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
96 } 105 }
97 106
98 SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(new LLUUID((string)requestData["UUID"]));
99 XmlRpcResponse SimLoginResp = new XmlRpcResponse(); 107 XmlRpcResponse SimLoginResp = new XmlRpcResponse();
100 Hashtable SimLoginRespData = new Hashtable(); 108 Hashtable SimLoginRespData = new Hashtable();
101 109
@@ -115,7 +123,8 @@ namespace OpenGridServices.GridServer
115 SimNeighboursData.Add(NeighbourBlock); 123 SimNeighboursData.Add(NeighbourBlock);
116 } 124 }
117 } 125 }
118 126
127 SimLoginRespData["UUID"]=TheSim.UUID;
119 SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString(); 128 SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString();
120 SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString(); 129 SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString();
121 SimLoginRespData["regionname"]=TheSim.regionname; 130 SimLoginRespData["regionname"]=TheSim.regionname;
@@ -138,15 +147,24 @@ namespace OpenGridServices.GridServer
138 return ""; 147 return "";
139 } 148 }
140 149
141 static string ParseREST(string requestBody, string requestURL, string HTTPmethod) { 150 static string ParseREST(string requestURL, string requestBody, string HTTPmethod) {
142 char[] splitter = {'/'}; 151 char[] splitter = {'/'};
143 string[] rest_params = requestURL.Split(splitter); 152 string[] rest_params = requestURL.Split(splitter);
144 string req_type = rest_params[0]; // First part of the URL is the type of request - 153 string req_type = rest_params[0]; // First part of the URL is the type of request -
145 string respstring; 154 string respstring="";
155 SimProfileBase TheSim;
156 Console.WriteLine(req_type);
146 switch(req_type) { 157 switch(req_type) {
147 case "sims": 158 case "regions":
159 // DIRTY HACK ALERT
160 Console.WriteLine("/regions/ accessed");
161 TheSim=OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));
162 respstring=ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);
163 break;
164
165 case "sims":
148 LLUUID UUID = new LLUUID((string)rest_params[1]); 166 LLUUID UUID = new LLUUID((string)rest_params[1]);
149 SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(UUID); 167 TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(UUID);
150 if(!(TheSim==null)) { 168 if(!(TheSim==null)) {
151 switch(HTTPmethod) { 169 switch(HTTPmethod) {
152 case "GET": 170 case "GET":
@@ -162,18 +180,67 @@ namespace OpenGridServices.GridServer
162 respstring+="</sim>"; 180 respstring+="</sim>";
163 break; 181 break;
164 case "POST": 182 case "POST":
183 Console.WriteLine("Updating sim details.....");
165 XmlDocument doc = new XmlDocument(); 184 XmlDocument doc = new XmlDocument();
166 doc.LoadXml(requestBody); 185 doc.LoadXml(requestBody);
167 XmlNode authkeynode = doc.FirstChild; 186 XmlNode authkeynode = doc.FirstChild;
168 if (authkeynode.Name != "authkey") 187 if (authkeynode.Name != "authkey") {
169 respstring = "<error>bad XML - expected authkey tag</error>"; 188 respstring = "ERROR! bad XML - expected authkey tag";
189 return respstring;
190 }
170 XmlNode simnode = doc.ChildNodes[1]; 191 XmlNode simnode = doc.ChildNodes[1];
171 if (simnode.Name != "sim") 192 if (simnode.Name != "sim") {
172 respstring = "<error>bad XML - expected sim tag</error>"; 193 respstring = "ERROR! bad XML - expected sim tag";
194 return respstring;
195 }
196 if (authkeynode.Name != OpenGrid_Main.thegrid.SimRecvKey) {
197 respstring = "ERROR! invalid key";
198 return respstring;
199 }
200
201 if (TheSim==null) {
202 respstring="ERROR! sim not found";
203 return respstring;
204 } else {
205 for(int i=0; i<= simnode.ChildNodes.Count; i++) {
206 switch(simnode.ChildNodes[i].Name) {
207 case "uuid":
208 // should a sim be able to update it's own UUID? To be decided
209 // watch next week for the exciting conclusion in "the adventures of OpenGridServices.GridServer/GridHttp.cs:ParseREST() at line 190!
210 break; // and line 190's arch-enemy - THE BREAK STATEMENT! OH NOES!!!!! (this code written at 6:57AM, no sleep, lots of caffeine)
211
212 case "regionname":
213 TheSim.regionname=simnode.ChildNodes[i].InnerText;
214 break;
215
216 case "sim_ip":
217 TheSim.sim_ip=simnode.ChildNodes[i].InnerText;
218 break;
219
220 case "sim_port":
221 TheSim.sim_port=Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
222 break;
223
224 case "region_locx":
225 TheSim.RegionLocX=Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
226 TheSim.regionhandle=Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
227 break;
228
229 case "region_locy":
230 TheSim.RegionLocY=Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
231 TheSim.regionhandle=Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
232 break;
233 }
234 }
235 respstring="OK";
236 }
237
238
173 239
174 break; 240 break;
175 } 241 }
176 } 242 }
243 return respstring;
177 break; 244 break;
178 } 245 }
179 return ""; 246 return "";
@@ -209,9 +276,14 @@ namespace OpenGridServices.GridServer
209 response.AddHeader("Content-type","text/xml"); 276 response.AddHeader("Content-type","text/xml");
210 break; 277 break;
211 278
279 case "text/plaintext":
280 // must be REST
281 responseString=ParseREST(request.RawUrl,requestBody,request.HttpMethod);
282 break;
283
212 case null: 284 case null:
213 // must be REST or invalid crap, so pass to the REST parser 285 // must be REST or invalid crap, so pass to the REST parser
214 responseString=ParseREST(request.Url.OriginalString,requestBody,request.HttpMethod); 286 responseString=ParseREST(request.RawUrl,requestBody,request.HttpMethod);
215 break; 287 break;
216 } 288 }
217 289
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 90eaf1f..111e2f7 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -1,48 +1,48 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenGridServices.GridServer" default="build"> 2<project name="OpenGridServices.GridServer" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> 10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > 11 <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="GridHttp.cs" /> 14 <include name="GridHttp.cs" />
15 <include name="Main.cs" /> 15 <include name="Main.cs" />
16 <include name="SimProfiles.cs" /> 16 <include name="SimProfiles.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()}">
20 <lib> 20 <lib>
21 <include name="${project::get-base-directory()}" /> 21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" /> 22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib> 23 </lib>
24 <include name="System.dll" /> 24 <include name="System.dll" />
25 <include name="System.Data.dll" /> 25 <include name="System.Data.dll" />
26 <include name="System.Xml.dll" /> 26 <include name="System.Xml.dll" />
27 <include name="../bin/OpenSim.Framework.dll" /> 27 <include name="../bin/OpenSim.Framework.dll" />
28 <include name="../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../bin/OpenSim.Framework.Console.dll" />
29 <include name="../bin/libsecondlife.dll" /> 29 <include name="../bin/libsecondlife.dll" />
30 <include name="../bin/Db4objects.Db4o.dll" /> 30 <include name="../bin/Db4objects.Db4o.dll" />
31 </references> 31 </references>
32 </csc> 32 </csc>
33 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 33 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
34 <mkdir dir="${project::get-base-directory()}/../bin/"/> 34 <mkdir dir="${project::get-base-directory()}/../bin/"/>
35 <copy todir="${project::get-base-directory()}/../bin/"> 35 <copy todir="${project::get-base-directory()}/../bin/">
36 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 36 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
37 <include name="*.dll"/> 37 <include name="*.dll"/>
38 <include name="*.exe"/> 38 <include name="*.exe"/>
39 </fileset> 39 </fileset>
40 </copy> 40 </copy>
41 </target> 41 </target>
42 <target name="clean"> 42 <target name="clean">
43 <delete dir="${bin.dir}" failonerror="false" /> 43 <delete dir="${bin.dir}" failonerror="false" />
44 <delete dir="${obj.dir}" failonerror="false" /> 44 <delete dir="${obj.dir}" failonerror="false" />
45 </target> 45 </target>
46 <target name="doc" description="Creates documentation."> 46 <target name="doc" description="Creates documentation.">
47 </target> 47 </target>
48</project> 48</project>
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 999d446..9c128d3 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -99,6 +99,39 @@ namespace OpenGridServices.UserServer
99 _httpd = new UserHTTPServer(); 99 _httpd = new UserHTTPServer();
100 } 100 }
101 101
102
103 public void do_create(string what)
104 {
105 switch(what)
106 {
107 case "user":
108 m_console.WriteLine("Creating new user profile");
109 string tempfirstname;
110 string templastname;
111 string tempMD5Passwd;
112
113 tempfirstname=m_console.CmdPrompt("First name: ");
114 templastname=m_console.CmdPrompt("Last name: ");
115 tempMD5Passwd=m_console.PasswdPrompt("Password: ");
116
117 System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider();
118 byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd);
119 bs = x.ComputeHash(bs);
120 System.Text.StringBuilder s = new System.Text.StringBuilder();
121 foreach (byte b in bs)
122 {
123 s.Append(b.ToString("x2").ToLower());
124 }
125 tempMD5Passwd = s.ToString();
126
127 UserProfile newuser=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd);
128 newuser.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f);
129 newuser.homepos = new LLVector3(128f,128f,23f);
130 _profilemanager.SaveUserProfiles();
131 break;
132 }
133 }
134
102 public void RunCmd(string cmd, string[] cmdparams) 135 public void RunCmd(string cmd, string[] cmdparams)
103 { 136 {
104 switch (cmd) 137 switch (cmd)
@@ -108,31 +141,9 @@ namespace OpenGridServices.UserServer
108 m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)"); 141 m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)");
109 break; 142 break;
110 143
111 case "create user": 144 case "create":
112 m_console.WriteLine("Creating new user profile"); 145 do_create(cmdparams[0]);
113 string tempfirstname; 146 break;
114 string templastname;
115 string tempMD5Passwd;
116
117 tempfirstname=m_console.CmdPrompt("First name: ");
118 templastname=m_console.CmdPrompt("Last name: ");
119 tempMD5Passwd=m_console.PasswdPrompt("Password: ");
120
121 System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider();
122 byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd);
123 bs = x.ComputeHash(bs);
124 System.Text.StringBuilder s = new System.Text.StringBuilder();
125 foreach (byte b in bs)
126 {
127 s.Append(b.ToString("x2").ToLower());
128 }
129 tempMD5Passwd = "$1$" + s.ToString();
130
131 UserProfile newuser=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd);
132 newuser.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f);
133 newuser.homepos = new LLVector3(128f,128f,23f);
134 _profilemanager.SaveUserProfiles();
135 break;
136 147
137 case "shutdown": 148 case "shutdown":
138 m_console.Close(); 149 m_console.Close();
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 7212a7b..fd1be15 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -1,47 +1,47 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenGridServices.UserServer" default="build"> 2<project name="OpenGridServices.UserServer" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> 10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > 11 <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Main.cs" /> 14 <include name="Main.cs" />
15 <include name="UserHttp.cs" /> 15 <include name="UserHttp.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()}">
19 <lib> 19 <lib>
20 <include name="${project::get-base-directory()}" /> 20 <include name="${project::get-base-directory()}" />
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Data.dll" /> 24 <include name="System.Data.dll" />
25 <include name="System.Xml.dll" /> 25 <include name="System.Xml.dll" />
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/libsecondlife.dll" /> 28 <include name="../bin/libsecondlife.dll" />
29 <include name="../bin/Db4objects.Db4o.dll" /> 29 <include name="../bin/Db4objects.Db4o.dll" />
30 </references> 30 </references>
31 </csc> 31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../bin/"/> 33 <mkdir dir="${project::get-base-directory()}/../bin/"/>
34 <copy todir="${project::get-base-directory()}/../bin/"> 34 <copy todir="${project::get-base-directory()}/../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/> 36 <include name="*.dll"/>
37 <include name="*.exe"/> 37 <include name="*.exe"/>
38 </fileset> 38 </fileset>
39 </copy> 39 </copy>
40 </target> 40 </target>
41 <target name="clean"> 41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" /> 42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" /> 43 <delete dir="${obj.dir}" failonerror="false" />
44 </target> 44 </target>
45 <target name="doc" description="Creates documentation."> 45 <target name="doc" description="Creates documentation.">
46 </target> 46 </target>
47</project> 47</project>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index fa90bb6..a3019ee 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
@@ -1,42 +1,42 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework.Console" default="build"> 2<project name="OpenSim.Framework.Console" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
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="ConsoleBase.cs" /> 15 <include name="ConsoleBase.cs" />
16 <include name="ConsoleCallbacksBase.cs" /> 16 <include name="ConsoleCallbacksBase.cs" />
17 <include name="MainConsole.cs" /> 17 <include name="MainConsole.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
20 <lib> 20 <lib>
21 <include name="${project::get-base-directory()}" /> 21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" /> 22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib> 23 </lib>
24 <include name="System.dll" /> 24 <include name="System.dll" />
25 </references> 25 </references>
26 </csc> 26 </csc>
27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
28 <mkdir dir="${project::get-base-directory()}/../bin/"/> 28 <mkdir dir="${project::get-base-directory()}/../bin/"/>
29 <copy todir="${project::get-base-directory()}/../bin/"> 29 <copy todir="${project::get-base-directory()}/../bin/">
30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
31 <include name="*.dll"/> 31 <include name="*.dll"/>
32 <include name="*.exe"/> 32 <include name="*.exe"/>
33 </fileset> 33 </fileset>
34 </copy> 34 </copy>
35 </target> 35 </target>
36 <target name="clean"> 36 <target name="clean">
37 <delete dir="${bin.dir}" failonerror="false" /> 37 <delete dir="${bin.dir}" failonerror="false" />
38 <delete dir="${obj.dir}" failonerror="false" /> 38 <delete dir="${obj.dir}" failonerror="false" />
39 </target> 39 </target>
40 <target name="doc" description="Creates documentation."> 40 <target name="doc" description="Creates documentation.">
41 </target> 41 </target>
42</project> 42</project>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 89010d2..b351625 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,67 +1,67 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework" default="build"> 2<project name="OpenSim.Framework" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Framework" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentCiruitData.cs" /> 14 <include name="AgentCiruitData.cs" />
15 <include name="AgentInventory.cs" /> 15 <include name="AgentInventory.cs" />
16 <include name="AssetBase.cs" /> 16 <include name="AssetBase.cs" />
17 <include name="BlockingQueue.cs" /> 17 <include name="BlockingQueue.cs" />
18 <include name="HeightMapGenHills.cs" /> 18 <include name="HeightMapGenHills.cs" />
19 <include name="IAssetServer.cs" /> 19 <include name="IAssetServer.cs" />
20 <include name="IConfig.cs" /> 20 <include name="IConfig.cs" />
21 <include name="IGenericConfig.cs" /> 21 <include name="IGenericConfig.cs" />
22 <include name="IGridConfig.cs" /> 22 <include name="IGridConfig.cs" />
23 <include name="IGridServer.cs" /> 23 <include name="IGridServer.cs" />
24 <include name="ILocalStorage.cs" /> 24 <include name="ILocalStorage.cs" />
25 <include name="IUserConfig.cs" /> 25 <include name="IUserConfig.cs" />
26 <include name="IUserServer.cs" /> 26 <include name="IUserServer.cs" />
27 <include name="LocalGridBase.cs" /> 27 <include name="LocalGridBase.cs" />
28 <include name="Login.cs" /> 28 <include name="Login.cs" />
29 <include name="LoginService.cs" /> 29 <include name="LoginService.cs" />
30 <include name="NeighbourInfo.cs" /> 30 <include name="NeighbourInfo.cs" />
31 <include name="PrimData.cs" /> 31 <include name="PrimData.cs" />
32 <include name="RemoteGridBase.cs" /> 32 <include name="RemoteGridBase.cs" />
33 <include name="SimProfile.cs" /> 33 <include name="SimProfile.cs" />
34 <include name="SimProfileBase.cs" /> 34 <include name="SimProfileBase.cs" />
35 <include name="UserProfile.cs" /> 35 <include name="UserProfile.cs" />
36 <include name="UserProfileManager.cs" /> 36 <include name="UserProfileManager.cs" />
37 <include name="UserProfileManagerBase.cs" /> 37 <include name="UserProfileManagerBase.cs" />
38 <include name="Util.cs" /> 38 <include name="Util.cs" />
39 <include name="Properties/AssemblyInfo.cs" /> 39 <include name="Properties/AssemblyInfo.cs" />
40 </sources> 40 </sources>
41 <references basedir="${project::get-base-directory()}"> 41 <references basedir="${project::get-base-directory()}">
42 <lib> 42 <lib>
43 <include name="${project::get-base-directory()}" /> 43 <include name="${project::get-base-directory()}" />
44 <include name="${project::get-base-directory()}/${build.dir}" /> 44 <include name="${project::get-base-directory()}/${build.dir}" />
45 </lib> 45 </lib>
46 <include name="System.dll" /> 46 <include name="System.dll" />
47 <include name="System.Xml.dll" /> 47 <include name="System.Xml.dll" />
48 <include name="../bin/libsecondlife.dll" /> 48 <include name="../bin/libsecondlife.dll" />
49 <include name="../bin/Db4objects.Db4o.dll" /> 49 <include name="../bin/Db4objects.Db4o.dll" />
50 </references> 50 </references>
51 </csc> 51 </csc>
52 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 52 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
53 <mkdir dir="${project::get-base-directory()}/../bin/"/> 53 <mkdir dir="${project::get-base-directory()}/../bin/"/>
54 <copy todir="${project::get-base-directory()}/../bin/"> 54 <copy todir="${project::get-base-directory()}/../bin/">
55 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 55 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
56 <include name="*.dll"/> 56 <include name="*.dll"/>
57 <include name="*.exe"/> 57 <include name="*.exe"/>
58 </fileset> 58 </fileset>
59 </copy> 59 </copy>
60 </target> 60 </target>
61 <target name="clean"> 61 <target name="clean">
62 <delete dir="${bin.dir}" failonerror="false" /> 62 <delete dir="${bin.dir}" failonerror="false" />
63 <delete dir="${obj.dir}" failonerror="false" /> 63 <delete dir="${obj.dir}" failonerror="false" />
64 </target> 64 </target>
65 <target name="doc" description="Creates documentation."> 65 <target name="doc" description="Creates documentation.">
66 </target> 66 </target>
67</project> 67</project>
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ac4cf9e..fd130f0 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -16,11 +16,43 @@ namespace OpenSim.Framework.Sims
16 { 16 {
17 Hashtable GridReqParams = new Hashtable(); 17 Hashtable GridReqParams = new Hashtable();
18 GridReqParams["region_handle"] = region_handle.ToString(); 18 GridReqParams["region_handle"] = region_handle.ToString();
19 GridReqParams["authkey"] = SendKey;
20 ArrayList SendParams = new ArrayList();
21 SendParams.Add(GridReqParams);
22 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
23
24 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
25
26 Hashtable RespData = (Hashtable)GridResp.Value;
27 this.UUID = new LLUUID((string)RespData["UUID"]);
28 this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]);
29 this.regionname = (string)RespData["regionname"];
30 this.sim_ip = (string)RespData["sim_ip"];
31 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
32 this.caps_url = (string)RespData["caps_url"];
33 this.RegionLocX = (uint)Convert.ToUInt32(RespData["RegionLocX"]);
34 this.RegionLocY = (uint)Convert.ToUInt32(RespData["RegionLocY"]);
35 this.sendkey = (string)RespData["sendkey"];
36 this.recvkey = (string)RespData["recvkey"];
37 }
38 catch (Exception e)
39 {
40 Console.WriteLine(e.ToString());
41 }
42 return this;
43 }
44
45 public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
46 {
47 try
48 {
49 Hashtable GridReqParams = new Hashtable();
50 GridReqParams["UUID"] = UUID.ToString();
19 GridReqParams["caller"] = "userserver"; 51 GridReqParams["caller"] = "userserver";
20 GridReqParams["authkey"] = SendKey; 52 GridReqParams["authkey"] = SendKey;
21 ArrayList SendParams = new ArrayList(); 53 ArrayList SendParams = new ArrayList();
22 SendParams.Add(GridReqParams); 54 SendParams.Add(GridReqParams);
23 XmlRpcRequest GridReq = new XmlRpcRequest("get_sim_info", SendParams); 55 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
24 56
25 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000); 57 XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
26 58
@@ -42,6 +74,7 @@ namespace OpenSim.Framework.Sims
42 } 74 }
43 return this; 75 return this;
44 } 76 }
77
45 78
46 public SimProfile() 79 public SimProfile()
47 { 80 {
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index d474834..38ca5df 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -90,8 +90,8 @@ namespace OpenSim.Framework.User
90 90
91 LLUUID AgentID = TheUser.UUID; 91 LLUUID AgentID = TheUser.UUID;
92 TheUser.InitSessionData(); 92 TheUser.InitSessionData();
93 // SimProfile SimInfo = new SimProfile(); 93 SimProfile SimInfo = new SimProfile();
94 // SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); 94 SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
95 95
96 96
97 Hashtable GlobalT = new Hashtable(); 97 Hashtable GlobalT = new Hashtable();
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.User
146 InitialOutfit.Add(InitialOutfitHash); 146 InitialOutfit.Add(InitialOutfitHash);
147 147
148 uint circode = (uint)(Util.RandomClass.Next()); 148 uint circode = (uint)(Util.RandomClass.Next());
149 //TheUser.AddSimCircuit(circode, SimInfo.UUID); 149 TheUser.AddSimCircuit(circode, SimInfo.UUID);
150 150
151 responseData["last_name"] = TheUser.lastname; 151 responseData["last_name"] = TheUser.lastname;
152 responseData["ui-config"] = ui_config; 152 responseData["ui-config"] = ui_config;
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.User
181 181
182 this.CustomiseResponse(ref responseData, TheUser); 182 this.CustomiseResponse(ref responseData, TheUser);
183 response.Value = responseData; 183 response.Value = responseData;
184 //TheUser.SendDataToSim(SimInfo); 184 // TheUser.SendDataToSim(SimInfo);
185 185
186 186
187 187
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index f34e4ac..6335985 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
@@ -1,42 +1,42 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.GenericConfig.Xml" default="build"> 2<project name="OpenSim.GenericConfig.Xml" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" > 11 <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="XmlConfig.cs" /> 14 <include name="XmlConfig.cs" />
15 <include name="Properties/AssemblyInfo.cs" /> 15 <include name="Properties/AssemblyInfo.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="../../bin/OpenSim.Framework.dll" /> 24 <include name="../../bin/OpenSim.Framework.dll" />
25 </references> 25 </references>
26 </csc> 26 </csc>
27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
28 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 28 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
29 <copy todir="${project::get-base-directory()}/../../bin/"> 29 <copy todir="${project::get-base-directory()}/../../bin/">
30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
31 <include name="*.dll"/> 31 <include name="*.dll"/>
32 <include name="*.exe"/> 32 <include name="*.exe"/>
33 </fileset> 33 </fileset>
34 </copy> 34 </copy>
35 </target> 35 </target>
36 <target name="clean"> 36 <target name="clean">
37 <delete dir="${bin.dir}" failonerror="false" /> 37 <delete dir="${bin.dir}" failonerror="false" />
38 <delete dir="${obj.dir}" failonerror="false" /> 38 <delete dir="${obj.dir}" failonerror="false" />
39 </target> 39 </target>
40 <target name="doc" description="Creates documentation."> 40 <target name="doc" description="Creates documentation.">
41 </target> 41 </target>
42</project> 42</project>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index 6bf398e..c7a1966 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -1,46 +1,46 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.GridInterfaces.Local" default="build"> 2<project name="OpenSim.GridInterfaces.Local" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > 11 <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
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="LocalAssetServer.cs" /> 15 <include name="LocalAssetServer.cs" />
16 <include name="LocalGridServer.cs" /> 16 <include name="LocalGridServer.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
19 <lib> 19 <lib>
20 <include name="${project::get-base-directory()}" /> 20 <include name="${project::get-base-directory()}" />
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Xml.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/Db4objects.Db4o.dll" /> 25 <include name="../../bin/Db4objects.Db4o.dll" />
26 <include name="../../bin/libsecondlife.dll" /> 26 <include name="../../bin/libsecondlife.dll" />
27 <include name="../../bin/OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
28 <include name="../../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../../bin/OpenSim.Framework.Console.dll" />
29 </references> 29 </references>
30 </csc> 30 </csc>
31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
32 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 32 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
33 <copy todir="${project::get-base-directory()}/../../bin/"> 33 <copy todir="${project::get-base-directory()}/../../bin/">
34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
35 <include name="*.dll"/> 35 <include name="*.dll"/>
36 <include name="*.exe"/> 36 <include name="*.exe"/>
37 </fileset> 37 </fileset>
38 </copy> 38 </copy>
39 </target> 39 </target>
40 <target name="clean"> 40 <target name="clean">
41 <delete dir="${bin.dir}" failonerror="false" /> 41 <delete dir="${bin.dir}" failonerror="false" />
42 <delete dir="${obj.dir}" failonerror="false" /> 42 <delete dir="${obj.dir}" failonerror="false" />
43 </target> 43 </target>
44 <target name="doc" description="Creates documentation."> 44 <target name="doc" description="Creates documentation.">
45 </target> 45 </target>
46</project> 46</project>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index dd6db18..4788f32 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -1,45 +1,45 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.GridInterfaces.Remote" default="build"> 2<project name="OpenSim.GridInterfaces.Remote" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > 11 <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
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="RemoteAssetServer.cs" /> 15 <include name="RemoteAssetServer.cs" />
16 <include name="RemoteGridServer.cs" /> 16 <include name="RemoteGridServer.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
19 <lib> 19 <lib>
20 <include name="${project::get-base-directory()}" /> 20 <include name="${project::get-base-directory()}" />
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Xml.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/libsecondlife.dll" /> 25 <include name="../../bin/libsecondlife.dll" />
26 <include name="../../bin/OpenSim.Framework.dll" /> 26 <include name="../../bin/OpenSim.Framework.dll" />
27 <include name="../../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../../bin/OpenSim.Framework.Console.dll" />
28 </references> 28 </references>
29 </csc> 29 </csc>
30 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 30 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
31 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 31 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
32 <copy todir="${project::get-base-directory()}/../../bin/"> 32 <copy todir="${project::get-base-directory()}/../../bin/">
33 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 33 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
34 <include name="*.dll"/> 34 <include name="*.dll"/>
35 <include name="*.exe"/> 35 <include name="*.exe"/>
36 </fileset> 36 </fileset>
37 </copy> 37 </copy>
38 </target> 38 </target>
39 <target name="clean"> 39 <target name="clean">
40 <delete dir="${bin.dir}" failonerror="false" /> 40 <delete dir="${bin.dir}" failonerror="false" />
41 <delete dir="${obj.dir}" failonerror="false" /> 41 <delete dir="${obj.dir}" failonerror="false" />
42 </target> 42 </target>
43 <target name="doc" description="Creates documentation."> 43 <target name="doc" description="Creates documentation.">
44 </target> 44 </target>
45</project> 45</project>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 3497a55..7b063a3 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -1,42 +1,42 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> 2<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > 11 <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
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="BasicPhysicsPlugin.cs" /> 15 <include name="BasicPhysicsPlugin.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="../../bin/Axiom.MathLib.dll" /> 23 <include name="../../bin/Axiom.MathLib.dll" />
24 <include name="../../bin/OpenSim.Physics.Manager.dll" /> 24 <include name="../../bin/OpenSim.Physics.Manager.dll" />
25 </references> 25 </references>
26 </csc> 26 </csc>
27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> 27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
28 <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> 28 <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
29 <copy todir="${project::get-base-directory()}/../../bin/Physics/"> 29 <copy todir="${project::get-base-directory()}/../../bin/Physics/">
30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
31 <include name="*.dll"/> 31 <include name="*.dll"/>
32 <include name="*.exe"/> 32 <include name="*.exe"/>
33 </fileset> 33 </fileset>
34 </copy> 34 </copy>
35 </target> 35 </target>
36 <target name="clean"> 36 <target name="clean">
37 <delete dir="${bin.dir}" failonerror="false" /> 37 <delete dir="${bin.dir}" failonerror="false" />
38 <delete dir="${obj.dir}" failonerror="false" /> 38 <delete dir="${obj.dir}" failonerror="false" />
39 </target> 39 </target>
40 <target name="doc" description="Creates documentation."> 40 <target name="doc" description="Creates documentation.">
41 </target> 41 </target>
42</project> 42</project>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4b5ee51..1554485 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -1,47 +1,47 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Physics.Manager" default="build"> 2<project name="OpenSim.Physics.Manager" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > 11 <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
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="PhysicsActor.cs" /> 15 <include name="PhysicsActor.cs" />
16 <include name="PhysicsManager.cs" /> 16 <include name="PhysicsManager.cs" />
17 <include name="PhysicsScene.cs" /> 17 <include name="PhysicsScene.cs" />
18 <include name="PhysicsVector.cs" /> 18 <include name="PhysicsVector.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
21 <lib> 21 <lib>
22 <include name="${project::get-base-directory()}" /> 22 <include name="${project::get-base-directory()}" />
23 <include name="${project::get-base-directory()}/${build.dir}" /> 23 <include name="${project::get-base-directory()}/${build.dir}" />
24 </lib> 24 </lib>
25 <include name="System.dll" /> 25 <include name="System.dll" />
26 <include name="System.Xml.dll" /> 26 <include name="System.Xml.dll" />
27 <include name="../../bin/Axiom.MathLib.dll" /> 27 <include name="../../bin/Axiom.MathLib.dll" />
28 <include name="../../bin/OpenSim.Framework.dll" /> 28 <include name="../../bin/OpenSim.Framework.dll" />
29 <include name="../../bin/OpenSim.Framework.Console.dll" /> 29 <include name="../../bin/OpenSim.Framework.Console.dll" />
30 </references> 30 </references>
31 </csc> 31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 33 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
34 <copy todir="${project::get-base-directory()}/../../bin/"> 34 <copy todir="${project::get-base-directory()}/../../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/> 36 <include name="*.dll"/>
37 <include name="*.exe"/> 37 <include name="*.exe"/>
38 </fileset> 38 </fileset>
39 </copy> 39 </copy>
40 </target> 40 </target>
41 <target name="clean"> 41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" /> 42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" /> 43 <delete dir="${obj.dir}" failonerror="false" />
44 </target> 44 </target>
45 <target name="doc" description="Creates documentation."> 45 <target name="doc" description="Creates documentation.">
46 </target> 46 </target>
47</project> 47</project>
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index f25361a..098472a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -1,43 +1,43 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Physics.OdePlugin" default="build"> 2<project name="OpenSim.Physics.OdePlugin" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > 11 <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
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="OdePlugin.cs" /> 15 <include name="OdePlugin.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="../../bin/Axiom.MathLib.dll" /> 23 <include name="../../bin/Axiom.MathLib.dll" />
24 <include name="../../bin/OpenSim.Physics.Manager.dll" /> 24 <include name="../../bin/OpenSim.Physics.Manager.dll" />
25 <include name="../../bin/Ode.NET.dll" /> 25 <include name="../../bin/Ode.NET.dll" />
26 </references> 26 </references>
27 </csc> 27 </csc>
28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> 28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
29 <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> 29 <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
30 <copy todir="${project::get-base-directory()}/../../bin/Physics/"> 30 <copy todir="${project::get-base-directory()}/../../bin/Physics/">
31 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 31 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
32 <include name="*.dll"/> 32 <include name="*.dll"/>
33 <include name="*.exe"/> 33 <include name="*.exe"/>
34 </fileset> 34 </fileset>
35 </copy> 35 </copy>
36 </target> 36 </target>
37 <target name="clean"> 37 <target name="clean">
38 <delete dir="${bin.dir}" failonerror="false" /> 38 <delete dir="${bin.dir}" failonerror="false" />
39 <delete dir="${obj.dir}" failonerror="false" /> 39 <delete dir="${obj.dir}" failonerror="false" />
40 </target> 40 </target>
41 <target name="doc" description="Creates documentation."> 41 <target name="doc" description="Creates documentation.">
42 </target> 42 </target>
43</project> 43</project>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 5ab70bb..3ae7013 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -1,43 +1,43 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Physics.PhysXPlugin" default="build"> 2<project name="OpenSim.Physics.PhysXPlugin" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > 11 <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
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="PhysXPlugin.cs" /> 15 <include name="PhysXPlugin.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="../../bin/Axiom.MathLib.dll" /> 23 <include name="../../bin/Axiom.MathLib.dll" />
24 <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> 24 <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />
25 <include name="../../bin/OpenSim.Physics.Manager.dll" /> 25 <include name="../../bin/OpenSim.Physics.Manager.dll" />
26 </references> 26 </references>
27 </csc> 27 </csc>
28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> 28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
29 <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> 29 <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
30 <copy todir="${project::get-base-directory()}/../../bin/Physics/"> 30 <copy todir="${project::get-base-directory()}/../../bin/Physics/">
31 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 31 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
32 <include name="*.dll"/> 32 <include name="*.dll"/>
33 <include name="*.exe"/> 33 <include name="*.exe"/>
34 </fileset> 34 </fileset>
35 </copy> 35 </copy>
36 </target> 36 </target>
37 <target name="clean"> 37 <target name="clean">
38 <delete dir="${bin.dir}" failonerror="false" /> 38 <delete dir="${bin.dir}" failonerror="false" />
39 <delete dir="${obj.dir}" failonerror="false" /> 39 <delete dir="${obj.dir}" failonerror="false" />
40 </target> 40 </target>
41 <target name="doc" description="Creates documentation."> 41 <target name="doc" description="Creates documentation.">
42 </target> 42 </target>
43</project> 43</project>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 331cfd4..cd900f5 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,82 +1,82 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.RegionServer" default="build"> 2<project name="OpenSim.RegionServer" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="ConsoleCmds.cs" /> 15 <include name="ConsoleCmds.cs" />
16 <include name="Grid.cs" /> 16 <include name="Grid.cs" />
17 <include name="OpenSimMain.cs" /> 17 <include name="OpenSimMain.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="PacketServer.cs" /> 19 <include name="PacketServer.cs" />
20 <include name="QueItem.cs" /> 20 <include name="QueItem.cs" />
21 <include name="RegionInfo.cs" /> 21 <include name="RegionInfo.cs" />
22 <include name="SimClient.cs" /> 22 <include name="SimClient.cs" />
23 <include name="SimConsole.cs" /> 23 <include name="SimConsole.cs" />
24 <include name="VersionInfo.cs" /> 24 <include name="VersionInfo.cs" />
25 <include name="Assets/AssetCache.cs" /> 25 <include name="Assets/AssetCache.cs" />
26 <include name="Assets/InventoryCache.cs" /> 26 <include name="Assets/InventoryCache.cs" />
27 <include name="CAPS/AdminWebFront.cs" /> 27 <include name="CAPS/AdminWebFront.cs" />
28 <include name="types/Mesh.cs" /> 28 <include name="types/Mesh.cs" />
29 <include name="types/Triangle.cs" /> 29 <include name="types/Triangle.cs" />
30 <include name="world/Avatar.cs" /> 30 <include name="world/Avatar.cs" />
31 <include name="world/AvatarAnimations.cs" /> 31 <include name="world/AvatarAnimations.cs" />
32 <include name="world/AvatarClient.cs" /> 32 <include name="world/AvatarClient.cs" />
33 <include name="world/AvatarUpdate.cs" /> 33 <include name="world/AvatarUpdate.cs" />
34 <include name="world/Entity.cs" /> 34 <include name="world/Entity.cs" />
35 <include name="world/Primitive.cs" /> 35 <include name="world/Primitive.cs" />
36 <include name="world/Primitive2.cs" /> 36 <include name="world/Primitive2.cs" />
37 <include name="world/ScriptEngine.cs" /> 37 <include name="world/ScriptEngine.cs" />
38 <include name="world/SurfacePatch.cs" /> 38 <include name="world/SurfacePatch.cs" />
39 <include name="world/World.cs" /> 39 <include name="world/World.cs" />
40 <include name="world/WorldPacketHandlers.cs" /> 40 <include name="world/WorldPacketHandlers.cs" />
41 <include name="world/scripting/IScript.cs" /> 41 <include name="world/scripting/IScript.cs" />
42 <include name="world/scripting/IScriptContext.cs" /> 42 <include name="world/scripting/IScriptContext.cs" />
43 <include name="world/scripting/IScriptEntity.cs" /> 43 <include name="world/scripting/IScriptEntity.cs" />
44 <include name="world/scripting/IScriptHandler.cs" /> 44 <include name="world/scripting/IScriptHandler.cs" />
45 <include name="world/scripting/Script.cs" /> 45 <include name="world/scripting/Script.cs" />
46 <include name="world/scripting/ScriptFactory.cs" /> 46 <include name="world/scripting/ScriptFactory.cs" />
47 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> 47 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
48 </sources> 48 </sources>
49 <references basedir="${project::get-base-directory()}"> 49 <references basedir="${project::get-base-directory()}">
50 <lib> 50 <lib>
51 <include name="${project::get-base-directory()}" /> 51 <include name="${project::get-base-directory()}" />
52 <include name="${project::get-base-directory()}/${build.dir}" /> 52 <include name="${project::get-base-directory()}/${build.dir}" />
53 </lib> 53 </lib>
54 <include name="System.dll" /> 54 <include name="System.dll" />
55 <include name="System.Xml.dll" /> 55 <include name="System.Xml.dll" />
56 <include name="../bin/libsecondlife.dll" /> 56 <include name="../bin/libsecondlife.dll" />
57 <include name="../bin/Axiom.MathLib.dll" /> 57 <include name="../bin/Axiom.MathLib.dll" />
58 <include name="../bin/Db4objects.Db4o.dll" /> 58 <include name="../bin/Db4objects.Db4o.dll" />
59 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" /> 59 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
60 <include name="../bin/OpenSim.Framework.dll" /> 60 <include name="../bin/OpenSim.Framework.dll" />
61 <include name="../bin/OpenSim.Framework.Console.dll" /> 61 <include name="../bin/OpenSim.Framework.Console.dll" />
62 <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> 62 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
63 <include name="../bin/OpenSim.Physics.Manager.dll" /> 63 <include name="../bin/OpenSim.Physics.Manager.dll" />
64 <include name="../bin/OpenSim.Servers.dll" /> 64 <include name="../bin/OpenSim.Servers.dll" />
65 </references> 65 </references>
66 </csc> 66 </csc>
67 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 67 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
68 <mkdir dir="${project::get-base-directory()}/../bin/"/> 68 <mkdir dir="${project::get-base-directory()}/../bin/"/>
69 <copy todir="${project::get-base-directory()}/../bin/"> 69 <copy todir="${project::get-base-directory()}/../bin/">
70 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 70 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
71 <include name="*.dll"/> 71 <include name="*.dll"/>
72 <include name="*.exe"/> 72 <include name="*.exe"/>
73 </fileset> 73 </fileset>
74 </copy> 74 </copy>
75 </target> 75 </target>
76 <target name="clean"> 76 <target name="clean">
77 <delete dir="${bin.dir}" failonerror="false" /> 77 <delete dir="${bin.dir}" failonerror="false" />
78 <delete dir="${obj.dir}" failonerror="false" /> 78 <delete dir="${obj.dir}" failonerror="false" />
79 </target> 79 </target>
80 <target name="doc" description="Creates documentation."> 80 <target name="doc" description="Creates documentation.">
81 </target> 81 </target>
82</project> 82</project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 34fa243..d36dbfc 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -114,7 +114,6 @@ namespace OpenSim
114 } 114 }
115 m_console.WriteLine("Main.cs:Startup() - Loading configuration"); 115 m_console.WriteLine("Main.cs:Startup() - Loading configuration");
116 this.regionData.InitConfig(this.m_sandbox, this.localConfig); 116 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
117 //regionData.SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID")); //don't need as regionData.SimUUID is already set through the above line
118 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change 117 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
119 118
120 119
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index cf0c075..e120198 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -1,6 +1,9 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using System.Net;
5using System.Web;
6using System.IO;
4using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;
6using libsecondlife; 9using libsecondlife;
@@ -34,7 +37,37 @@ namespace OpenSim
34 public RegionInfo() 37 public RegionInfo()
35 { 38 {
36 39
37 } 40 }
41
42 public void SaveToGrid()
43 {
44 string reqtext;
45 reqtext="<authkey>" + this.GridSendKey + "</authkey>";
46 reqtext+="<sim>";
47 reqtext+="<uuid>" + this.SimUUID.ToString() + "</uuid>";
48 reqtext+="<regionname>" + this.RegionName + "</regionname>";
49 reqtext+="<sim_ip>" + this.IPListenAddr + "</sim_ip>";
50 reqtext+="<sim_port>" + this.IPListenPort.ToString() + "</sim_port>";
51 reqtext+="<region_locx>" + this.RegionLocX.ToString() + "</region_locx>";
52 reqtext+="<region_locy>" + this.RegionLocY.ToString() + "</region_locy>";
53 reqtext+="<estate_id>1</estate_id>";
54 reqtext+="</sim>";
55
56 WebRequest GridSaveReq = WebRequest.Create(this.GridURL + "sims/" + this.SimUUID.ToString());
57 GridSaveReq.Method = "POST";
58 GridSaveReq.ContentType = "text/plaintext";
59 GridSaveReq.ContentLength = reqtext.Length;
60
61 StreamWriter stOut = new StreamWriter(GridSaveReq.GetRequestStream(), System.Text.Encoding.ASCII);
62 stOut.Write(reqtext);
63 stOut.Close();
64
65 StreamReader stIn = new StreamReader(GridSaveReq.GetResponse().GetResponseStream());
66 string GridResponse = stIn.ReadToEnd();
67 stIn.Close();
68
69 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);
70 }
38 71
39 public void InitConfig(bool sandboxMode, IGenericConfig configData) 72 public void InitConfig(bool sandboxMode, IGenericConfig configData)
40 { 73 {
@@ -122,31 +155,7 @@ namespace OpenSim
122 { 155 {
123 //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object 156 //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object
124 157
125 // Asset Server URL 158 //Grid Server URL
126 attri = "";
127 attri = configData.GetAttribute("AssetServerURL");
128 if (attri == "")
129 {
130 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL: ");
131 configData.SetAttribute("AssetServerURL", this.AssetURL);
132 }
133 else
134 {
135 this.AssetURL = attri;
136 }
137 //Asset Server key
138 attri = "";
139 attri = configData.GetAttribute("AssetServerKey");
140 if (attri == "")
141 {
142 this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server key: ");
143 configData.SetAttribute("AssetServerKey", this.AssetSendKey);
144 }
145 else
146 {
147 this.AssetSendKey = attri;
148 }
149 //Grid Sever URL
150 attri = ""; 159 attri = "";
151 attri = configData.GetAttribute("GridServerURL"); 160 attri = configData.GetAttribute("GridServerURL");
152 if (attri == "") 161 if (attri == "")
@@ -158,6 +167,7 @@ namespace OpenSim
158 { 167 {
159 this.GridURL = attri; 168 this.GridURL = attri;
160 } 169 }
170
161 //Grid Send Key 171 //Grid Send Key
162 attri = ""; 172 attri = "";
163 attri = configData.GetAttribute("GridSendKey"); 173 attri = configData.GetAttribute("GridSendKey");
@@ -170,6 +180,7 @@ namespace OpenSim
170 { 180 {
171 this.GridSendKey = attri; 181 this.GridSendKey = attri;
172 } 182 }
183
173 //Grid Receive Key 184 //Grid Receive Key
174 attri = ""; 185 attri = "";
175 attri = configData.GetAttribute("GridRecvKey"); 186 attri = configData.GetAttribute("GridRecvKey");
@@ -181,45 +192,12 @@ namespace OpenSim
181 else 192 else
182 { 193 {
183 this.GridRecvKey = attri; 194 this.GridRecvKey = attri;
184 } 195 }
185 //User Server URL 196
186 attri = ""; 197
187 attri = configData.GetAttribute("UserServerURL");
188 if (attri == "")
189 {
190 this.UserURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("User server URL: ");
191 configData.SetAttribute("UserServerURL", this.UserURL);
192 }
193 else
194 {
195 this.UserURL = attri;
196 }
197 //User Send Key
198 attri = "";
199 attri = configData.GetAttribute("UserSendKey");
200 if (attri == "")
201 {
202 this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
203 configData.SetAttribute("UserSendKey", this.UserSendKey);
204 }
205 else
206 {
207 this.UserSendKey = attri;
208 }
209 //User Receive Key
210 attri = "";
211 attri = configData.GetAttribute("UserRecvKey");
212 if (attri == "")
213 {
214 this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
215 configData.SetAttribute("UserRecvKey", this.UserRecvKey);
216 }
217 else
218 {
219 this.UserRecvKey = attri;
220 }
221 } 198 }
222 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); 199 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
200 this.SaveToGrid();
223 configData.Commit(); 201 configData.Commit();
224 } 202 }
225 catch (Exception e) 203 catch (Exception e)
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index f28d224..9592c1e 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -1,47 +1,47 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Storage.LocalStorageBerkeleyDB" default="build"> 2<project name="OpenSim.Storage.LocalStorageBerkeleyDB" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" > 11 <resources prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="BDBLocalStorage.cs" /> 14 <include name="BDBLocalStorage.cs" />
15 <include name="Properties/AssemblyInfo.cs" /> 15 <include name="Properties/AssemblyInfo.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="System.Data.dll" /> 24 <include name="System.Data.dll" />
25 <include name="../bin/Kds.Serialization.dll" /> 25 <include name="../bin/Kds.Serialization.dll" />
26 <include name="../bin/libDB_dotNET43.dll" /> 26 <include name="../bin/libdb_dotNET43.dll" />
27 <include name="../bin/libsecondlife.dll" /> 27 <include name="../bin/libsecondlife.dll" />
28 <include name="../bin/OpenSim.Framework.dll" /> 28 <include name="../bin/OpenSim.Framework.dll" />
29 <include name="../bin/OpenSim.Framework.Console.dll" /> 29 <include name="../bin/OpenSim.Framework.Console.dll" />
30 </references> 30 </references>
31 </csc> 31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../bin/"/> 33 <mkdir dir="${project::get-base-directory()}/../bin/"/>
34 <copy todir="${project::get-base-directory()}/../bin/"> 34 <copy todir="${project::get-base-directory()}/../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/> 36 <include name="*.dll"/>
37 <include name="*.exe"/> 37 <include name="*.exe"/>
38 </fileset> 38 </fileset>
39 </copy> 39 </copy>
40 </target> 40 </target>
41 <target name="clean"> 41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" /> 42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" /> 43 <delete dir="${obj.dir}" failonerror="false" />
44 </target> 44 </target>
45 <target name="doc" description="Creates documentation."> 45 <target name="doc" description="Creates documentation.">
46 </target> 46 </target>
47</project> 47</project>
diff --git a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index f3a6683..c3699af 100644
--- a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -1,46 +1,46 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Storage.LocalStorageSQLite" default="build"> 2<project name="OpenSim.Storage.LocalStorageSQLite" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Storage.LocalStorageSQLite" dynamicprefix="true" > 11 <resources prefix="OpenSim.Storage.LocalStorageSQLite" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="SQLiteLocalStorage.cs" /> 14 <include name="SQLiteLocalStorage.cs" />
15 <include name="Properties/AssemblyInfo.cs" /> 15 <include name="Properties/AssemblyInfo.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="System.Data.dll" /> 24 <include name="System.Data.dll" />
25 <include name="../bin/System.Data.SQLite.dll" /> 25 <include name="../bin/System.Data.SQLite.dll" />
26 <include name="../bin/libsecondlife.dll" /> 26 <include name="../bin/libsecondlife.dll" />
27 <include name="../bin/OpenSim.Framework.dll" /> 27 <include name="../bin/OpenSim.Framework.dll" />
28 <include name="../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../bin/OpenSim.Framework.Console.dll" />
29 </references> 29 </references>
30 </csc> 30 </csc>
31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
32 <mkdir dir="${project::get-base-directory()}/../bin/"/> 32 <mkdir dir="${project::get-base-directory()}/../bin/"/>
33 <copy todir="${project::get-base-directory()}/../bin/"> 33 <copy todir="${project::get-base-directory()}/../bin/">
34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
35 <include name="*.dll"/> 35 <include name="*.dll"/>
36 <include name="*.exe"/> 36 <include name="*.exe"/>
37 </fileset> 37 </fileset>
38 </copy> 38 </copy>
39 </target> 39 </target>
40 <target name="clean"> 40 <target name="clean">
41 <delete dir="${bin.dir}" failonerror="false" /> 41 <delete dir="${bin.dir}" failonerror="false" />
42 <delete dir="${obj.dir}" failonerror="false" /> 42 <delete dir="${obj.dir}" failonerror="false" />
43 </target> 43 </target>
44 <target name="doc" description="Creates documentation."> 44 <target name="doc" description="Creates documentation.">
45 </target> 45 </target>
46</project> 46</project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 8be321d..439f440 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -1,47 +1,47 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Storage.LocalStorageDb4o" default="build"> 2<project name="OpenSim.Storage.LocalStorageDb4o" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > 11 <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
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" /> 15 <include name="Db4LocalStorage.cs" />
16 <include name="MapStorage.cs" /> 16 <include name="MapStorage.cs" />
17 <include name="UUIDQuery.cs" /> 17 <include name="UUIDQuery.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
20 <lib> 20 <lib>
21 <include name="${project::get-base-directory()}" /> 21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" /> 22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib> 23 </lib>
24 <include name="System.dll" /> 24 <include name="System.dll" />
25 <include name="System.Xml.dll" /> 25 <include name="System.Xml.dll" />
26 <include name="../../bin/Db4objects.Db4o.dll" /> 26 <include name="../../bin/Db4objects.Db4o.dll" />
27 <include name="../../bin/libsecondlife.dll" /> 27 <include name="../../bin/libsecondlife.dll" />
28 <include name="../../bin/OpenSim.Framework.dll" /> 28 <include name="../../bin/OpenSim.Framework.dll" />
29 <include name="../../bin/OpenSim.Framework.Console.dll" /> 29 <include name="../../bin/OpenSim.Framework.Console.dll" />
30 </references> 30 </references>
31 </csc> 31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 33 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
34 <copy todir="${project::get-base-directory()}/../../bin/"> 34 <copy todir="${project::get-base-directory()}/../../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/> 36 <include name="*.dll"/>
37 <include name="*.exe"/> 37 <include name="*.exe"/>
38 </fileset> 38 </fileset>
39 </copy> 39 </copy>
40 </target> 40 </target>
41 <target name="clean"> 41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" /> 42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" /> 43 <delete dir="${obj.dir}" failonerror="false" />
44 </target> 44 </target>
45 <target name="doc" description="Creates documentation."> 45 <target name="doc" description="Creates documentation.">
46 </target> 46 </target>
47</project> 47</project>
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index d2e6c9f..2c43aa0 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -1,43 +1,43 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Terrain.BasicTerrain" default="build"> 2<project name="OpenSim.Terrain.BasicTerrain" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" > 11 <resources prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="TerrainEngine.cs" /> 14 <include name="TerrainEngine.cs" />
15 <include name="Properties/AssemblyInfo.cs" /> 15 <include name="Properties/AssemblyInfo.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="../bin/libTerrain-BSD.dll" /> 22 <include name="../bin/libTerrain-BSD.dll" />
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Data.dll" /> 24 <include name="System.Data.dll" />
25 <include name="System.Xml.dll" /> 25 <include name="System.Xml.dll" />
26 </references> 26 </references>
27 </csc> 27 </csc>
28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 28 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
29 <mkdir dir="${project::get-base-directory()}/../bin/"/> 29 <mkdir dir="${project::get-base-directory()}/../bin/"/>
30 <copy todir="${project::get-base-directory()}/../bin/"> 30 <copy todir="${project::get-base-directory()}/../bin/">
31 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 31 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
32 <include name="*.dll"/> 32 <include name="*.dll"/>
33 <include name="*.exe"/> 33 <include name="*.exe"/>
34 </fileset> 34 </fileset>
35 </copy> 35 </copy>
36 </target> 36 </target>
37 <target name="clean"> 37 <target name="clean">
38 <delete dir="${bin.dir}" failonerror="false" /> 38 <delete dir="${bin.dir}" failonerror="false" />
39 <delete dir="${obj.dir}" failonerror="false" /> 39 <delete dir="${obj.dir}" failonerror="false" />
40 </target> 40 </target>
41 <target name="doc" description="Creates documentation."> 41 <target name="doc" description="Creates documentation.">
42 </target> 42 </target>
43</project> 43</project>
diff --git a/OpenSim.build b/OpenSim.build
index a807110..6d9df46 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -1,124 +1,124 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim" default="build"> 2<project name="OpenSim" default="build">
3 <echo message="Using '${nant.settings.currentframework}' Framework"/> 3 <echo message="Using '${nant.settings.currentframework}' Framework"/>
4 4
5 <property name="bin.dir" value="bin" /> 5 <property name="bin.dir" value="bin" />
6 <property name="obj.dir" value="obj" /> 6 <property name="obj.dir" value="obj" />
7 <property name="doc.dir" value="doc" /> 7 <property name="doc.dir" value="doc" />
8 <property name="project.main.dir" value="${project::get-base-directory()}" /> 8 <property name="project.main.dir" value="${project::get-base-directory()}" />
9 9 <property name="project.config" value="Release" />
10 <target name="Debug" description=""> 10
11 <property name="project.config" value="Debug" /> 11 <target name="Release" description="">
12 <property name="build.debug" value="true" /> 12 <property name="project.config" value="Release" />
13 </target> 13 <property name="build.debug" value="false" />
14 14 </target>
15 <property name="project.config" value="Release" /> 15
16 16
17 <target name="Release" description=""> 17 <target name="Debug" description="">
18 <property name="project.config" value="Release" /> 18 <property name="project.config" value="Debug" />
19 <property name="build.debug" value="false" /> 19 <property name="build.debug" value="true" />
20 </target> 20 </target>
21 21
22 <target name="net-1.1" description="Sets framework to .NET 1.1"> 22 <target name="net-1.1" description="Sets framework to .NET 1.1">
23 <property name="nant.settings.currentframework" value="net-1.1" /> 23 <property name="nant.settings.currentframework" value="net-1.1" />
24 </target> 24 </target>
25 25
26 <target name="net-2.0" description="Sets framework to .NET 2.0"> 26 <target name="net-2.0" description="Sets framework to .NET 2.0">
27 <property name="nant.settings.currentframework" value="net-2.0" /> 27 <property name="nant.settings.currentframework" value="net-2.0" />
28 </target> 28 </target>
29 29
30 <target name="mono-2.0" description="Sets framework to mono 2.0"> 30 <target name="mono-2.0" description="Sets framework to mono 2.0">
31 <property name="nant.settings.currentframework" value="mono-2.0" /> 31 <property name="nant.settings.currentframework" value="mono-2.0" />
32 </target> 32 </target>
33 33
34 <target name="mono-1.0" description="Sets framework to mono 1.0"> 34 <target name="mono-1.0" description="Sets framework to mono 1.0">
35 <property name="nant.settings.currentframework" value="mono-1.0" /> 35 <property name="nant.settings.currentframework" value="mono-1.0" />
36 </target> 36 </target>
37 37
38 <target name="init" description=""> 38 <target name="init" description="">
39 <call target="${project.config}" /> 39 <call target="${project.config}" />
40 <sysinfo /> 40 <sysinfo />
41 <echo message="Platform ${sys.os.platform}" /> 41 <echo message="Platform ${sys.os.platform}" />
42 <property name="build.dir" value="${bin.dir}/${project.config}" /> 42 <property name="build.dir" value="${bin.dir}/${project.config}" />
43 </target> 43 </target>
44 44
45 <target name="clean" description=""> 45 <target name="clean" description="">
46 <echo message="Deleting all builds from all configurations" /> 46 <echo message="Deleting all builds from all configurations" />
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> 49 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
50 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> 50 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
51 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> 51 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
52 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> 52 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
53 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> 53 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
54 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> 54 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
55 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> 55 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
56 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> 56 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
57 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> 57 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
58 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> 58 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
59 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> 59 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
60 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> 60 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
61 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> 61 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
62 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> 62 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
63 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> 63 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
64 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> 64 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
65 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> 65 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
66 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> 66 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
67 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> 67 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
68 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> 68 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
69 </target> 69 </target>
70 70
71 <target name="build" depends="init" description=""> 71 <target name="build" depends="init" description="">
72 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> 72 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
73 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> 73 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
74 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> 74 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" />
75 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 75 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
76 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 76 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
77 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> 77 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
78 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> 78 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
79 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> 79 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
80 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> 80 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
81 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> 81 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
82 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> 82 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
83 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> 83 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
84 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> 84 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
85 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" /> 85 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
86 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" /> 86 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
87 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> 87 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
88 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> 88 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
89 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> 89 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
90 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" /> 90 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
91 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" /> 91 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
92 </target> 92 </target>
93 93
94 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> 94 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
95 95
96 <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> 96 <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
97 97
98 <target name="package" depends="clean, doc" description="Builds all" /> 98 <target name="package" depends="clean, doc" description="Builds all" />
99 99
100 <target name="doc" depends="build-release"> 100 <target name="doc" depends="build-release">
101 <echo message="Generating all documentation from all builds" /> 101 <echo message="Generating all documentation from all builds" />
102 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> 102 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
103 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> 103 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
104 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> 104 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
105 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> 105 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
106 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> 106 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
107 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> 107 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
108 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> 108 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
109 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> 109 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
110 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> 110 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
111 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> 111 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
112 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> 112 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
113 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> 113 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
114 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> 114 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
115 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> 115 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
116 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> 116 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
117 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> 117 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
118 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> 118 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
119 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> 119 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
120 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> 120 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
121 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> 121 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
122 </target> 122 </target>
123 123
124</project> 124</project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 02445df..54b7a3b 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,48 +1,48 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim" default="build"> 2<project name="OpenSim" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> 10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
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="Application.cs" /> 14 <include name="Application.cs" />
15 </sources> 15 </sources>
16 <references basedir="${project::get-base-directory()}"> 16 <references basedir="${project::get-base-directory()}">
17 <lib> 17 <lib>
18 <include name="${project::get-base-directory()}" /> 18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" /> 19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib> 20 </lib>
21 <include name="System.dll" /> 21 <include name="System.dll" />
22 <include name="System.Xml.dll" /> 22 <include name="System.Xml.dll" />
23 <include name="../bin/libsecondlife.dll" /> 23 <include name="../bin/libsecondlife.dll" />
24 <include name="../bin/Axiom.MathLib.dll" /> 24 <include name="../bin/Axiom.MathLib.dll" />
25 <include name="../bin/Db4objects.Db4o.dll" /> 25 <include name="../bin/Db4objects.Db4o.dll" />
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/OpenSim.Physics.Manager.dll" /> 28 <include name="../bin/OpenSim.Physics.Manager.dll" />
29 <include name="../bin/OpenSim.Servers.dll" /> 29 <include name="../bin/OpenSim.Servers.dll" />
30 <include name="../bin/OpenSim.RegionServer.dll" /> 30 <include name="../bin/OpenSim.RegionServer.dll" />
31 </references> 31 </references>
32 </csc> 32 </csc>
33 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 33 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
34 <mkdir dir="${project::get-base-directory()}/../bin/"/> 34 <mkdir dir="${project::get-base-directory()}/../bin/"/>
35 <copy todir="${project::get-base-directory()}/../bin/"> 35 <copy todir="${project::get-base-directory()}/../bin/">
36 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 36 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
37 <include name="*.dll"/> 37 <include name="*.dll"/>
38 <include name="*.exe"/> 38 <include name="*.exe"/>
39 </fileset> 39 </fileset>
40 </copy> 40 </copy>
41 </target> 41 </target>
42 <target name="clean"> 42 <target name="clean">
43 <delete dir="${bin.dir}" failonerror="false" /> 43 <delete dir="${bin.dir}" failonerror="false" />
44 <delete dir="${obj.dir}" failonerror="false" /> 44 <delete dir="${obj.dir}" failonerror="false" />
45 </target> 45 </target>
46 <target name="doc" description="Creates documentation."> 46 <target name="doc" description="Creates documentation.">
47 </target> 47 </target>
48</project> 48</project>
diff --git a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 8494a0b..0abcfa1 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
@@ -1,46 +1,46 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenUser.Config.UserConfigDb4o" default="build"> 2<project name="OpenUser.Config.UserConfigDb4o" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" > 11 <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" >
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="DbUserConfig.cs" /> 15 <include name="DbUserConfig.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Data.dll.dll" /> 23 <include name="System.Data.dll.dll" />
24 <include name="System.Xml.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/libsecondlife.dll" /> 25 <include name="../../bin/libsecondlife.dll" />
26 <include name="../../bin/Db4objects.Db4o.dll" /> 26 <include name="../../bin/Db4objects.Db4o.dll" />
27 <include name="../../bin/OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
28 <include name="../../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../../bin/OpenSim.Framework.Console.dll" />
29 </references> 29 </references>
30 </csc> 30 </csc>
31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 31 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
32 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 32 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
33 <copy todir="${project::get-base-directory()}/../../bin/"> 33 <copy todir="${project::get-base-directory()}/../../bin/">
34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 34 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
35 <include name="*.dll"/> 35 <include name="*.dll"/>
36 <include name="*.exe"/> 36 <include name="*.exe"/>
37 </fileset> 37 </fileset>
38 </copy> 38 </copy>
39 </target> 39 </target>
40 <target name="clean"> 40 <target name="clean">
41 <delete dir="${bin.dir}" failonerror="false" /> 41 <delete dir="${bin.dir}" failonerror="false" />
42 <delete dir="${obj.dir}" failonerror="false" /> 42 <delete dir="${obj.dir}" failonerror="false" />
43 </target> 43 </target>
44 <target name="doc" description="Creates documentation."> 44 <target name="doc" description="Creates documentation.">
45 </target> 45 </target>
46</project> 46</project>
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
index 395fb31..743b826 100644
--- a/Prebuild/Prebuild.build
+++ b/Prebuild/Prebuild.build
@@ -1,67 +1,67 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="Prebuild" default="build"> 2<project name="Prebuild" default="build">
3 <echo message="Using '${nant.settings.currentframework}' Framework"/> 3 <echo message="Using '${nant.settings.currentframework}' Framework"/>
4 4
5 <property name="bin.dir" value="bin" /> 5 <property name="bin.dir" value="bin" />
6 <property name="obj.dir" value="obj" /> 6 <property name="obj.dir" value="obj" />
7 <property name="doc.dir" value="doc" /> 7 <property name="doc.dir" value="doc" />
8 <property name="project.main.dir" value="${project::get-base-directory()}" /> 8 <property name="project.main.dir" value="${project::get-base-directory()}" />
9 9 <property name="project.config" value="Release" />
10 <target name="Debug" description=""> 10
11 <property name="project.config" value="Debug" /> 11 <target name="Release" description="">
12 <property name="build.debug" value="true" /> 12 <property name="project.config" value="Release" />
13 </target> 13 <property name="build.debug" value="false" />
14 14 </target>
15 <property name="project.config" value="Release" /> 15
16 16
17 <target name="Release" description=""> 17 <target name="Debug" description="">
18 <property name="project.config" value="Release" /> 18 <property name="project.config" value="Debug" />
19 <property name="build.debug" value="false" /> 19 <property name="build.debug" value="true" />
20 </target> 20 </target>
21 21
22 <target name="net-1.1" description="Sets framework to .NET 1.1"> 22 <target name="net-1.1" description="Sets framework to .NET 1.1">
23 <property name="nant.settings.currentframework" value="net-1.1" /> 23 <property name="nant.settings.currentframework" value="net-1.1" />
24 </target> 24 </target>
25 25
26 <target name="net-2.0" description="Sets framework to .NET 2.0"> 26 <target name="net-2.0" description="Sets framework to .NET 2.0">
27 <property name="nant.settings.currentframework" value="net-2.0" /> 27 <property name="nant.settings.currentframework" value="net-2.0" />
28 </target> 28 </target>
29 29
30 <target name="mono-2.0" description="Sets framework to mono 2.0"> 30 <target name="mono-2.0" description="Sets framework to mono 2.0">
31 <property name="nant.settings.currentframework" value="mono-2.0" /> 31 <property name="nant.settings.currentframework" value="mono-2.0" />
32 </target> 32 </target>
33 33
34 <target name="mono-1.0" description="Sets framework to mono 1.0"> 34 <target name="mono-1.0" description="Sets framework to mono 1.0">
35 <property name="nant.settings.currentframework" value="mono-1.0" /> 35 <property name="nant.settings.currentframework" value="mono-1.0" />
36 </target> 36 </target>
37 37
38 <target name="init" description=""> 38 <target name="init" description="">
39 <call target="${project.config}" /> 39 <call target="${project.config}" />
40 <sysinfo /> 40 <sysinfo />
41 <echo message="Platform ${sys.os.platform}" /> 41 <echo message="Platform ${sys.os.platform}" />
42 <property name="build.dir" value="${bin.dir}/${project.config}" /> 42 <property name="build.dir" value="${bin.dir}/${project.config}" />
43 </target> 43 </target>
44 44
45 <target name="clean" description=""> 45 <target name="clean" description="">
46 <echo message="Deleting all builds from all configurations" /> 46 <echo message="Deleting all builds from all configurations" />
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 <nant buildfile="src/Prebuild.exe.build" target="clean" /> 49 <nant buildfile="src/Prebuild.exe.build" target="clean" />
50 </target> 50 </target>
51 51
52 <target name="build" depends="init" description=""> 52 <target name="build" depends="init" description="">
53 <nant buildfile="src/Prebuild.exe.build" target="build" /> 53 <nant buildfile="src/Prebuild.exe.build" target="build" />
54 </target> 54 </target>
55 55
56 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> 56 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
57 57
58 <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> 58 <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
59 59
60 <target name="package" depends="clean, doc" description="Builds all" /> 60 <target name="package" depends="clean, doc" description="Builds all" />
61 61
62 <target name="doc" depends="build-release"> 62 <target name="doc" depends="build-release">
63 <echo message="Generating all documentation from all builds" /> 63 <echo message="Generating all documentation from all builds" />
64 <nant buildfile="src/Prebuild.exe.build" target="doc" /> 64 <nant buildfile="src/Prebuild.exe.build" target="doc" />
65 </target> 65 </target>
66 66
67</project> 67</project>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 43f5516..628e7e1 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -1,80 +1,80 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="Prebuild" default="build"> 2<project name="Prebuild" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> 10 <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
11 <resources prefix="Prebuild" dynamicprefix="true" > 11 <resources prefix="Prebuild" dynamicprefix="true" >
12 <include name="App.ico" /> 12 <include name="App.ico" />
13 <include name="data/prebuild-1.7.xsd" /> 13 <include name="data/prebuild-1.7.xsd" />
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" /> 17 <include name="Core/FatalException.cs" />
18 <include name="Core/Kernel.cs" /> 18 <include name="Core/Kernel.cs" />
19 <include name="Core/UnknownLanguageException.cs" /> 19 <include name="Core/UnknownLanguageException.cs" />
20 <include name="Core/WarningException.cs" /> 20 <include name="Core/WarningException.cs" />
21 <include name="Core/Attributes/DataNodeAttribute.cs" /> 21 <include name="Core/Attributes/DataNodeAttribute.cs" />
22 <include name="Core/Attributes/OptionNodeAttribute.cs" /> 22 <include name="Core/Attributes/OptionNodeAttribute.cs" />
23 <include name="Core/Attributes/TargetAttribute.cs" /> 23 <include name="Core/Attributes/TargetAttribute.cs" />
24 <include name="Core/Interfaces/IDataNode.cs" /> 24 <include name="Core/Interfaces/IDataNode.cs" />
25 <include name="Core/Interfaces/ITarget.cs" /> 25 <include name="Core/Interfaces/ITarget.cs" />
26 <include name="Core/Nodes/ConfigurationNode.cs" /> 26 <include name="Core/Nodes/ConfigurationNode.cs" />
27 <include name="Core/Nodes/DataNode.cs" /> 27 <include name="Core/Nodes/DataNode.cs" />
28 <include name="Core/Nodes/ExcludeNode.cs" /> 28 <include name="Core/Nodes/ExcludeNode.cs" />
29 <include name="Core/Nodes/FileNode.cs" /> 29 <include name="Core/Nodes/FileNode.cs" />
30 <include name="Core/Nodes/FilesNode.cs" /> 30 <include name="Core/Nodes/FilesNode.cs" />
31 <include name="Core/Nodes/MatchNode.cs" /> 31 <include name="Core/Nodes/MatchNode.cs" />
32 <include name="Core/Nodes/OptionsNode.cs" /> 32 <include name="Core/Nodes/OptionsNode.cs" />
33 <include name="Core/Nodes/ProcessNode.cs" /> 33 <include name="Core/Nodes/ProcessNode.cs" />
34 <include name="Core/Nodes/ProjectNode.cs" /> 34 <include name="Core/Nodes/ProjectNode.cs" />
35 <include name="Core/Nodes/ReferenceNode.cs" /> 35 <include name="Core/Nodes/ReferenceNode.cs" />
36 <include name="Core/Nodes/ReferencePathNode.cs" /> 36 <include name="Core/Nodes/ReferencePathNode.cs" />
37 <include name="Core/Nodes/SolutionNode.cs" /> 37 <include name="Core/Nodes/SolutionNode.cs" />
38 <include name="Core/Parse/IfContext.cs" /> 38 <include name="Core/Parse/IfContext.cs" />
39 <include name="Core/Parse/Preprocessor.cs" /> 39 <include name="Core/Parse/Preprocessor.cs" />
40 <include name="Core/Targets/AutotoolsTarget.cs" /> 40 <include name="Core/Targets/AutotoolsTarget.cs" />
41 <include name="Core/Targets/DebugTarget.cs" /> 41 <include name="Core/Targets/DebugTarget.cs" />
42 <include name="Core/Targets/MonoDevelopTarget.cs" /> 42 <include name="Core/Targets/MonoDevelopTarget.cs" />
43 <include name="Core/Targets/NAntTarget.cs" /> 43 <include name="Core/Targets/NAntTarget.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" /> 44 <include name="Core/Targets/SharpDevelop2Target.cs" />
45 <include name="Core/Targets/SharpDevelopTarget.cs" /> 45 <include name="Core/Targets/SharpDevelopTarget.cs" />
46 <include name="Core/Targets/VS2002Target.cs" /> 46 <include name="Core/Targets/VS2002Target.cs" />
47 <include name="Core/Targets/VS2003Target.cs" /> 47 <include name="Core/Targets/VS2003Target.cs" />
48 <include name="Core/Targets/VS2005Target.cs" /> 48 <include name="Core/Targets/VS2005Target.cs" />
49 <include name="Core/Utilities/CommandLineCollection.cs" /> 49 <include name="Core/Utilities/CommandLineCollection.cs" />
50 <include name="Core/Utilities/CurrentDirectory.cs" /> 50 <include name="Core/Utilities/CurrentDirectory.cs" />
51 <include name="Core/Utilities/Helper.cs" /> 51 <include name="Core/Utilities/Helper.cs" />
52 <include name="Core/Utilities/Log.cs" /> 52 <include name="Core/Utilities/Log.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()}">
56 <lib> 56 <lib>
57 <include name="${project::get-base-directory()}" /> 57 <include name="${project::get-base-directory()}" />
58 <include name="${project::get-base-directory()}/${build.dir}" /> 58 <include name="${project::get-base-directory()}/${build.dir}" />
59 </lib> 59 </lib>
60 <include name="System.EnterpriseServices.dll" /> 60 <include name="System.EnterpriseServices.dll" />
61 <include name="System.Xml.dll" /> 61 <include name="System.Xml.dll" />
62 <include name="System.dll" /> 62 <include name="System.dll" />
63 </references> 63 </references>
64 </csc> 64 </csc>
65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
66 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 66 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
67 <copy todir="${project::get-base-directory()}/../../bin/"> 67 <copy todir="${project::get-base-directory()}/../../bin/">
68 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 68 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
69 <include name="*.dll"/> 69 <include name="*.dll"/>
70 <include name="*.exe"/> 70 <include name="*.exe"/>
71 </fileset> 71 </fileset>
72 </copy> 72 </copy>
73 </target> 73 </target>
74 <target name="clean"> 74 <target name="clean">
75 <delete dir="${bin.dir}" failonerror="false" /> 75 <delete dir="${bin.dir}" failonerror="false" />
76 <delete dir="${obj.dir}" failonerror="false" /> 76 <delete dir="${obj.dir}" failonerror="false" />
77 </target> 77 </target>
78 <target name="doc" description="Creates documentation."> 78 <target name="doc" description="Creates documentation.">
79 </target> 79 </target>
80</project> 80</project>
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build
index 1d4b496..74d1072 100644
--- a/Servers/OpenSim.Servers.dll.build
+++ b/Servers/OpenSim.Servers.dll.build
@@ -1,48 +1,48 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Servers" default="build"> 2<project name="OpenSim.Servers" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Servers" dynamicprefix="true" > 11 <resources prefix="OpenSim.Servers" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="BaseHttpServer.cs" /> 14 <include name="BaseHttpServer.cs" />
15 <include name="IRestHandler.cs" /> 15 <include name="IRestHandler.cs" />
16 <include name="LocalUserProfileManager.cs" /> 16 <include name="LocalUserProfileManager.cs" />
17 <include name="LoginResponse.cs" /> 17 <include name="LoginResponse.cs" />
18 <include name="LoginServer.cs" /> 18 <include name="LoginServer.cs" />
19 <include name="XmlRpcMethod.cs" /> 19 <include name="XmlRpcMethod.cs" />
20 </sources> 20 </sources>
21 <references basedir="${project::get-base-directory()}"> 21 <references basedir="${project::get-base-directory()}">
22 <lib> 22 <lib>
23 <include name="${project::get-base-directory()}" /> 23 <include name="${project::get-base-directory()}" />
24 <include name="${project::get-base-directory()}/${build.dir}" /> 24 <include name="${project::get-base-directory()}/${build.dir}" />
25 </lib> 25 </lib>
26 <include name="System.dll" /> 26 <include name="System.dll" />
27 <include name="System.Xml.dll" /> 27 <include name="System.Xml.dll" />
28 <include name="../bin/OpenSim.Framework.dll" /> 28 <include name="../bin/OpenSim.Framework.dll" />
29 <include name="../bin/OpenSim.Framework.Console.dll" /> 29 <include name="../bin/OpenSim.Framework.Console.dll" />
30 <include name="../bin/libsecondlife.dll" /> 30 <include name="../bin/libsecondlife.dll" />
31 </references> 31 </references>
32 </csc> 32 </csc>
33 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 33 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
34 <mkdir dir="${project::get-base-directory()}/../bin/"/> 34 <mkdir dir="${project::get-base-directory()}/../bin/"/>
35 <copy todir="${project::get-base-directory()}/../bin/"> 35 <copy todir="${project::get-base-directory()}/../bin/">
36 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 36 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
37 <include name="*.dll"/> 37 <include name="*.dll"/>
38 <include name="*.exe"/> 38 <include name="*.exe"/>
39 </fileset> 39 </fileset>
40 </copy> 40 </copy>
41 </target> 41 </target>
42 <target name="clean"> 42 <target name="clean">
43 <delete dir="${bin.dir}" failonerror="false" /> 43 <delete dir="${bin.dir}" failonerror="false" />
44 <delete dir="${obj.dir}" failonerror="false" /> 44 <delete dir="${obj.dir}" failonerror="false" />
45 </target> 45 </target>
46 <target name="doc" description="Creates documentation."> 46 <target name="doc" description="Creates documentation.">
47 </target> 47 </target>
48</project> 48</project>
diff --git a/bin/OpenSim.Terrain.BasicTerrain.dll b/bin/OpenSim.Terrain.BasicTerrain.dll
index 089f0c8..729a93f 100644
--- a/bin/OpenSim.Terrain.BasicTerrain.dll
+++ b/bin/OpenSim.Terrain.BasicTerrain.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index b0ea3be..659a298 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -516,7 +516,7 @@
516 <Reference name="System.Xml"/> 516 <Reference name="System.Xml"/>
517 <Reference name="System.Data"/> 517 <Reference name="System.Data"/>
518 <Reference name="Kds.Serialization.dll"/> 518 <Reference name="Kds.Serialization.dll"/>
519 <Reference name="libDB_dotNET43.dll"/> 519 <Reference name="libdb_dotNET43.dll"/>
520 <Reference name="libsecondlife.dll"/> 520 <Reference name="libsecondlife.dll"/>
521 <Reference name="OpenSim.Framework"/> 521 <Reference name="OpenSim.Framework"/>
522 <Reference name="OpenSim.Framework.Console"/> 522 <Reference name="OpenSim.Framework.Console"/>
@@ -525,7 +525,6 @@
525 </Files> 525 </Files>
526 </Project> 526 </Project>
527 527
528
529 </Solution> 528 </Solution>
530 529
531 530