aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 19:59:32 +0000
committerMelanie Thielker2008-08-14 19:59:32 +0000
commit7161689a97edcdeceee3d3eeeaee7eadc4e06a89 (patch)
treea6b77bb4cb8598ce3075f8b5e58895fe0f7a0363 /OpenSim/Grid/UserServer
parentMake the estate owner work. Changes permissions checks to allow the (diff)
downloadopensim-SC_OLD-7161689a97edcdeceee3d3eeeaee7eadc4e06a89.zip
opensim-SC_OLD-7161689a97edcdeceee3d3eeeaee7eadc4e06a89.tar.gz
opensim-SC_OLD-7161689a97edcdeceee3d3eeeaee7eadc4e06a89.tar.bz2
opensim-SC_OLD-7161689a97edcdeceee3d3eeeaee7eadc4e06a89.tar.xz
Adds UserFlags and GodLevel to the user data store and plumbs then in.
This will have no effect unless both the UGAI and the region are this revision or later
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs25
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 36f2a0d..5506631 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -156,6 +156,9 @@ namespace OpenSim.Grid.UserServer
156 responseData["home_look_x"] = profile.HomeLookAt.X.ToString(); 156 responseData["home_look_x"] = profile.HomeLookAt.X.ToString();
157 responseData["home_look_y"] = profile.HomeLookAt.Y.ToString(); 157 responseData["home_look_y"] = profile.HomeLookAt.Y.ToString();
158 responseData["home_look_z"] = profile.HomeLookAt.Z.ToString(); 158 responseData["home_look_z"] = profile.HomeLookAt.Z.ToString();
159
160 responseData["user_flags"] = profile.UserFlags.ToString();
161 responseData["god_level"] = profile.GodLevel.ToString();
159 response.Value = responseData; 162 response.Value = responseData;
160 163
161 return response; 164 return response;
@@ -638,6 +641,28 @@ namespace OpenSim.Grid.UserServer
638 m_log.Error("[PROFILE]:Failed to set home lookat z"); 641 m_log.Error("[PROFILE]:Failed to set home lookat z");
639 } 642 }
640 } 643 }
644 if (requestData.Contains("user_flags"))
645 {
646 try
647 {
648 userProfile.UserFlags = Convert.ToInt32((string)requestData["user_flags"]);
649 }
650 catch (InvalidCastException)
651 {
652 m_log.Error("[PROFILE]:Failed to set user flags");
653 }
654 }
655 if (requestData.Contains("god_level"))
656 {
657 try
658 {
659 userProfile.GodLevel = Convert.ToInt32((string)requestData["god_level"]);
660 }
661 catch (InvalidCastException)
662 {
663 m_log.Error("[PROFILE]:Failed to set god level");
664 }
665 }
641 // call plugin! 666 // call plugin!
642 bool ret = UpdateUserProfileProperties(userProfile); 667 bool ret = UpdateUserProfileProperties(userProfile);
643 responseData["returnString"] = ret.ToString(); 668 responseData["returnString"] = ret.ToString();