aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs1
-rw-r--r--OpenSim/Grid/GridServer/Main.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs22
3 files changed, 13 insertions, 12 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
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 856c447..6d428d0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -35,10 +35,10 @@ namespace OpenSim.Region.Communications.OGS1
35 userData.userAssetURI = (string)data["server_asset"]; 35 userData.userAssetURI = (string)data["server_asset"];
36 userData.profileFirstText = (string)data["profile_firstlife_about"]; 36 userData.profileFirstText = (string)data["profile_firstlife_about"];
37 userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]); 37 userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
38 userData.profileCanDoMask = (uint)data["profile_can_do"]; 38 userData.profileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
39 userData.profileWantDoMask = (uint)data["profile_want_do"]; 39 userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]);
40 userData.profileImage = new LLUUID((string)data["profile_image"]); 40 userData.profileImage = new LLUUID((string)data["profile_image"]);
41 userData.lastLogin = (int)data["profile_lastlogin"]; 41 userData.lastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
42 userData.homeLocation = new LLVector3(); 42 userData.homeLocation = new LLVector3();
43 userData.homeLookAt = new LLVector3(); 43 userData.homeLookAt = new LLVector3();
44 44
@@ -51,8 +51,8 @@ namespace OpenSim.Region.Communications.OGS1
51 public UserProfileData GetUserProfile(string name) 51 public UserProfileData GetUserProfile(string name)
52 { 52 {
53 53
54 try 54 //try
55 { 55 //{
56 Hashtable param = new Hashtable(); 56 Hashtable param = new Hashtable();
57 param["avatar_name"] = name; 57 param["avatar_name"] = name;
58 IList parameters = new ArrayList(); 58 IList parameters = new ArrayList();
@@ -62,12 +62,12 @@ namespace OpenSim.Region.Communications.OGS1
62 Hashtable respData = (Hashtable)resp.Value; 62 Hashtable respData = (Hashtable)resp.Value;
63 63
64 return ConvertXMLRPCDataToUserProfile(respData); 64 return ConvertXMLRPCDataToUserProfile(respData);
65 } 65 //}
66 catch (Exception e) 66 //catch (Exception e)
67 { 67 //{
68 Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message); 68 // Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message);
69 } 69 //}
70 return null; 70 //return null;
71 } 71 }
72 public UserProfileData GetUserProfile(LLUUID avatarID) 72 public UserProfileData GetUserProfile(LLUUID avatarID)
73 { 73 {