diff options
author | Melanie Thielker | 2008-08-15 22:49:26 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-15 22:49:26 +0000 |
commit | 04488d9d3819fd16502a095771d1513af02b7a93 (patch) | |
tree | 03e4673e0be665d07b45a456e8df2f11a0778bf2 /OpenSim/Grid/UserServer | |
parent | Pantis #1957 (diff) | |
download | opensim-SC-04488d9d3819fd16502a095771d1513af02b7a93.zip opensim-SC-04488d9d3819fd16502a095771d1513af02b7a93.tar.gz opensim-SC-04488d9d3819fd16502a095771d1513af02b7a93.tar.bz2 opensim-SC-04488d9d3819fd16502a095771d1513af02b7a93.tar.xz |
Plumb in the partner and the account title fields for profile info.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 5506631..b1d95da 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -159,6 +159,8 @@ namespace OpenSim.Grid.UserServer | |||
159 | 159 | ||
160 | responseData["user_flags"] = profile.UserFlags.ToString(); | 160 | responseData["user_flags"] = profile.UserFlags.ToString(); |
161 | responseData["god_level"] = profile.GodLevel.ToString(); | 161 | responseData["god_level"] = profile.GodLevel.ToString(); |
162 | responseData["custom_type"] = profile.CustomType.ToString(); | ||
163 | responseData["partner"] = profile.Partner.ToString(); | ||
162 | response.Value = responseData; | 164 | response.Value = responseData; |
163 | 165 | ||
164 | return response; | 166 | return response; |
@@ -663,6 +665,33 @@ namespace OpenSim.Grid.UserServer | |||
663 | m_log.Error("[PROFILE]:Failed to set god level"); | 665 | m_log.Error("[PROFILE]:Failed to set god level"); |
664 | } | 666 | } |
665 | } | 667 | } |
668 | if (requestData.Contains("custom_type")) | ||
669 | { | ||
670 | try | ||
671 | { | ||
672 | userProfile.CustomType = (string)requestData["custom_type"]; | ||
673 | } | ||
674 | catch (InvalidCastException) | ||
675 | { | ||
676 | m_log.Error("[PROFILE]:Failed to set custom type"); | ||
677 | } | ||
678 | } | ||
679 | if (requestData.Contains("partner")) | ||
680 | { | ||
681 | try | ||
682 | { | ||
683 | userProfile.Partner = new LLUUID((string)requestData["partner"]); | ||
684 | } | ||
685 | catch (InvalidCastException) | ||
686 | { | ||
687 | m_log.Error("[PROFILE]:Failed to set partner"); | ||
688 | } | ||
689 | } | ||
690 | else | ||
691 | { | ||
692 | userProfile.Partner = LLUUID.Zero; | ||
693 | } | ||
694 | |||
666 | // call plugin! | 695 | // call plugin! |
667 | bool ret = UpdateUserProfileProperties(userProfile); | 696 | bool ret = UpdateUserProfileProperties(userProfile); |
668 | responseData["returnString"] = ret.ToString(); | 697 | responseData["returnString"] = ret.ToString(); |