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/Region | |
parent | * Added conceptual LlsdMethod Demo to SimpleApp (work in progress) (diff) | |
download | opensim-SC_OLD-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.zip opensim-SC_OLD-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.gz opensim-SC_OLD-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.bz2 opensim-SC_OLD-67af17fdd185e4a70046ac3583d3c64e6c3c8fb9.tar.xz |
*OGS1 Key2Name/Name2Key works
*OGS1 doesnt crash on startup anymore
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 22 |
1 files changed, 11 insertions, 11 deletions
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 | { |