diff options
author | Adam Frisby | 2007-07-04 07:51:02 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-04 07:51:02 +0000 |
commit | f7a938a21d591e68d8e0db8bbcf6c78d5ad6937d (patch) | |
tree | 355092dcbe2f0ee0ecfcce13ce6599e9ea08a0f5 /OpenGridServices/OpenGridServices.GridServer | |
parent | * Updating trunk UserServer to make it sugilite happy (differentiation of reg... (diff) | |
download | opensim-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/OpenGridServices.GridServer/GridManager.cs | 10 | ||||
-rw-r--r-- | OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | 10 |
2 files changed, 10 insertions, 10 deletions
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/" /> |