diff options
author | mingchen | 2007-07-02 21:02:11 +0000 |
---|---|---|
committer | mingchen | 2007-07-02 21:02:11 +0000 |
commit | 67af17fdd185e4a70046ac3583d3c64e6c3c8fb9 (patch) | |
tree | d62c87408f2adbf84df7c18277c0d7fa8693e186 /OpenSim/Grid | |
parent | * Added conceptual LlsdMethod Demo to SimpleApp (work in progress) (diff) | |
download | opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.zip opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.gz opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.bz2 opensim-SC-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.xz |
*OGS1 Key2Name/Name2Key works
*OGS1 doesnt crash on startup anymore
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 47f7d00..e562721 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -223,6 +223,7 @@ namespace OpenSim.Grid.GridServer | |||
223 | SimProfileData TheSim = null; | 223 | SimProfileData TheSim = null; |
224 | Hashtable requestData = (Hashtable)request.Params[0]; | 224 | Hashtable requestData = (Hashtable)request.Params[0]; |
225 | 225 | ||
226 | Console.WriteLine("WOOT: " + requestData.ToString()); | ||
226 | if (requestData.ContainsKey("UUID")) | 227 | if (requestData.ContainsKey("UUID")) |
227 | { | 228 | { |
228 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); | 229 | TheSim = getRegion(new LLUUID((string)requestData["UUID"])); |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 5ac64b2..490f757 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.GridServer | |||
48 | /// </summary> | 48 | /// </summary> |
49 | public class OpenGrid_Main : conscmd_callback | 49 | public class OpenGrid_Main : conscmd_callback |
50 | { | 50 | { |
51 | private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; | 51 | private string ConfigDll = "OpenSim.Grid.GridServer.Config.dll"; |
52 | private string GridDll = "OpenSim.Framework.Data.MySQL.dll"; | 52 | private string GridDll = "OpenSim.Framework.Data.MySQL.dll"; |
53 | public GridConfig Cfg; | 53 | public GridConfig Cfg; |
54 | 54 | ||