aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices
diff options
context:
space:
mode:
authorAdam Frisby2007-07-04 07:51:02 +0000
committerAdam Frisby2007-07-04 07:51:02 +0000
commitf7a938a21d591e68d8e0db8bbcf6c78d5ad6937d (patch)
tree355092dcbe2f0ee0ecfcce13ce6599e9ea08a0f5 /OpenGridServices
parent* Updating trunk UserServer to make it sugilite happy (differentiation of reg... (diff)
downloadopensim-SC_OLD-f7a938a21d591e68d8e0db8bbcf6c78d5ad6937d.zip
opensim-SC_OLD-f7a938a21d591e68d8e0db8bbcf6c78d5ad6937d.tar.gz
opensim-SC_OLD-f7a938a21d591e68d8e0db8bbcf6c78d5ad6937d.tar.bz2
opensim-SC_OLD-f7a938a21d591e68d8e0db8bbcf6c78d5ad6937d.tar.xz
* Making trunk compile again for CC.net
Diffstat (limited to '')
-rw-r--r--OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build4
-rw-r--r--OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build6
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build10
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/GridManager.cs10
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build10
-rw-r--r--OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build10
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build10
-rw-r--r--OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build4
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.exe.build4
9 files changed, 34 insertions, 34 deletions
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index d0ba0a8..075593b 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
@@ -21,8 +21,8 @@
21 </lib> 21 </lib>
22 <include name="../../../bin/Db4objects.Db4o.dll" /> 22 <include name="../../../bin/Db4objects.Db4o.dll" />
23 <include name="../../../bin/libsecondlife.dll" /> 23 <include name="../../../bin/libsecondlife.dll" />
24 <include name="OpenSim.Framework.dll" /> 24 <include name="../../../bin/OpenSim.Framework.dll" />
25 <include name="OpenSim.Framework.Console.dll" /> 25 <include name="../../../bin/OpenSim.Framework.Console.dll" />
26 <include name="System.dll" /> 26 <include name="System.dll" />
27 <include name="System.Data.dll.dll" /> 27 <include name="System.Data.dll.dll" />
28 <include name="System.Xml.dll" /> 28 <include name="System.Xml.dll" />
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
index 7195699..9430ab9 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build
@@ -20,10 +20,10 @@
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/libsecondlife.dll" /> 22 <include name="../../bin/libsecondlife.dll" />
23 <include name="OpenSim.Framework.dll.dll" /> 23 <include name="../../bin/OpenSim.Framework.dll" />
24 <include name="OpenSim.Servers.dll.dll" /> 24 <include name="../../bin/OpenSim.Servers.dll" />
25 <include name="System.dll" /> 25 <include name="System.dll" />
26 <include name="XMLRPC.dll" /> 26 <include name="../../bin/XMLRPC.dll" />
27 </references> 27 </references>
28 </csc> 28 </csc>
29 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 29 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index f9976e3..808f015 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -22,14 +22,14 @@
22 </lib> 22 </lib>
23 <include name="../../bin/Db4objects.Db4o.dll" /> 23 <include name="../../bin/Db4objects.Db4o.dll" />
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
25 <include name="OpenSim.Framework.dll" /> 25 <include name="../../bin/OpenSim.Framework.dll" />
26 <include name="OpenSim.Framework.Console.dll" /> 26 <include name="../../bin/OpenSim.Framework.Console.dll" />
27 <include name="OpenSim.GridInterfaces.Local.dll" /> 27 <include name="../../bin/OpenSim.GridInterfaces.Local.dll" />
28 <include name="OpenSim.Servers.dll" /> 28 <include name="../../bin/OpenSim.Servers.dll" />
29 <include name="System.dll" /> 29 <include name="System.dll" />
30 <include name="System.Data.dll" /> 30 <include name="System.Data.dll" />
31 <include name="System.Xml.dll" /> 31 <include name="System.Xml.dll" />
32 <include name="XMLRPC.dll" /> 32 <include name="../../bin/XMLRPC.dll" />
33 </references> 33 </references>
34 </csc> 34 </csc>
35 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 35 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
index 4f00ce0..45d3676 100644
--- a/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices/OpenGridServices.GridServer/GridManager.cs
@@ -392,11 +392,11 @@ namespace OpenGridServices.GridServer
392 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString(); 392 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
393 393
394 // For Sugilite compatibility 394 // For Sugilite compatibility
395 simProfileBlock["regionhandle"] = aSim.Value.regionHandle.ToString(); 395 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();
396 simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString(); 396 simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();
397 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); 397 simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
398 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); 398 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
399 simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); 399 simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated();
400 400
401 simProfileList.Add(simProfileBlock); 401 simProfileList.Add(simProfileBlock);
402 } 402 }
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index f8951b7..60c0f85 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -24,14 +24,14 @@
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenGrid.Framework.Data.dll" /> 25 <include name="../../bin/OpenGrid.Framework.Data.dll" />
26 <include name="../../bin/OpenGrid.Framework.Manager.dll" /> 26 <include name="../../bin/OpenGrid.Framework.Manager.dll" />
27 <include name="OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
28 <include name="OpenSim.Framework.Console.dll" /> 28 <include name="../../bin/OpenSim.Framework.Console.dll" />
29 <include name="OpenSim.GenericConfig.Xml.dll" /> 29 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
30 <include name="OpenSim.Servers.dll" /> 30 <include name="../../bin/OpenSim.Servers.dll" />
31 <include name="System.dll" /> 31 <include name="System.dll" />
32 <include name="System.Data.dll" /> 32 <include name="System.Data.dll" />
33 <include name="System.Xml.dll" /> 33 <include name="System.Xml.dll" />
34 <include name="XMLRPC.dll" /> 34 <include name="../../bin/XMLRPC.dll" />
35 </references> 35 </references>
36 </csc> 36 </csc>
37 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 37 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
index ff980ad..5e67af1 100644
--- a/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
+++ b/OpenGridServices/OpenGridServices.InventoryServer/OpenGridServices.InventoryServer.exe.build
@@ -22,14 +22,14 @@
22 <include name="../../bin/Db4objects.Db4o.dll" /> 22 <include name="../../bin/Db4objects.Db4o.dll" />
23 <include name="../../bin/libsecondlife.dll" /> 23 <include name="../../bin/libsecondlife.dll" />
24 <include name="../../bin/OpenGrid.Framework.Data.dll" /> 24 <include name="../../bin/OpenGrid.Framework.Data.dll" />
25 <include name="OpenSim.Framework.dll" /> 25 <include name="../../bin/OpenSim.Framework.dll" />
26 <include name="OpenSim.Framework.Console.dll" /> 26 <include name="../../bin/OpenSim.Framework.Console.dll" />
27 <include name="OpenSim.GridInterfaces.Local.dll" /> 27 <include name="../../bin/OpenSim.GridInterfaces.Local.dll" />
28 <include name="OpenSim.Servers.dll" /> 28 <include name="../../bin/OpenSim.Servers.dll" />
29 <include name="System.dll" /> 29 <include name="System.dll" />
30 <include name="System.Data.dll" /> 30 <include name="System.Data.dll" />
31 <include name="System.Xml.dll" /> 31 <include name="System.Xml.dll" />
32 <include name="XMLRPC.dll" /> 32 <include name="../../bin/XMLRPC.dll" />
33 </references> 33 </references>
34 </csc> 34 </csc>
35 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 35 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 894c282..68cbef7 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -23,14 +23,14 @@
23 <include name="../../bin/Db4objects.Db4o.dll" /> 23 <include name="../../bin/Db4objects.Db4o.dll" />
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenGrid.Framework.Data.dll" /> 25 <include name="../../bin/OpenGrid.Framework.Data.dll" />
26 <include name="OpenSim.Framework.dll" /> 26 <include name="../../bin/OpenSim.Framework.dll" />
27 <include name="OpenSim.Framework.Console.dll" /> 27 <include name="../../bin/OpenSim.Framework.Console.dll" />
28 <include name="OpenSim.GenericConfig.Xml.dll" /> 28 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
29 <include name="OpenSim.Servers.dll" /> 29 <include name="../../bin/OpenSim.Servers.dll" />
30 <include name="System.dll" /> 30 <include name="System.dll" />
31 <include name="System.Data.dll" /> 31 <include name="System.Data.dll" />
32 <include name="System.Xml.dll" /> 32 <include name="System.Xml.dll" />
33 <include name="XMLRPC.dll" /> 33 <include name="../../bin/XMLRPC.dll" />
34 </references> 34 </references>
35 </csc> 35 </csc>
36 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 36 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 31801c7..bd5d49f 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
@@ -21,8 +21,8 @@
21 </lib> 21 </lib>
22 <include name="../../../bin/Db4objects.Db4o.dll" /> 22 <include name="../../../bin/Db4objects.Db4o.dll" />
23 <include name="../../../bin/libsecondlife.dll" /> 23 <include name="../../../bin/libsecondlife.dll" />
24 <include name="OpenSim.Framework.dll" /> 24 <include name="../../../bin/OpenSim.Framework.dll" />
25 <include name="OpenSim.Framework.Console.dll" /> 25 <include name="../../../bin/OpenSim.Framework.Console.dll" />
26 <include name="System.dll" /> 26 <include name="System.dll" />
27 <include name="System.Data.dll.dll" /> 27 <include name="System.Data.dll.dll" />
28 <include name="System.Xml.dll" /> 28 <include name="System.Xml.dll" />
diff --git a/OpenGridServices/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
index d50b1bb..e0502c6 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build
@@ -19,8 +19,8 @@
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="../../bin/libsecondlife.dll" /> 21 <include name="../../bin/libsecondlife.dll" />
22 <include name="OpenSim.Framework.dll.dll" /> 22 <include name="../../bin/OpenSim.Framework.dll" />
23 <include name="OpenSim.GenericConfig.Xml.dll" /> 23 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
24 <include name="System.dll" /> 24 <include name="System.dll" />
25 <include name="System.ServiceProcess.dll" /> 25 <include name="System.ServiceProcess.dll" />
26 <include name="System.Xml.dll" /> 26 <include name="System.Xml.dll" />
generated by cgit v1.1 at 2024-11-18 16:02:06 +0000