Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-01-03 16:52:53 -0800
committer: Dan Lake 2012-01-03 16:52:53 -0800
commit: ecf9824b63d181bd4e64bd5cb0ff37b952669bb9 (patch)
tree: 269207a773c6bd1fd8383885e0c5649d70b34a62 /OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
parent: Access to these static methods to serialize objects are useful outside of ser... (diff)
parent: Update C5.dll to version 1.1.1 from 1.1.0 (diff)
download: opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.zip
opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.gz
opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.bz2
opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index ab383ef..3fd69ae 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
            int userLevel = 0;
            if (request.ContainsKey("UserLevel") && int.TryParse(request["UserLevel"].ToString(), out userLevel))
-                existingAccount.UserFlags = userLevel;
+                existingAccount.UserLevel = userLevel;
            int userFlags = 0;
            if (request.ContainsKey("UserFlags") && int.TryParse(request["UserFlags"].ToString(), out userFlags))
author	Dan Lake	2012-01-03 16:52:53 -0800
committer	Dan Lake	2012-01-03 16:52:53 -0800
commit	ecf9824b63d181bd4e64bd5cb0ff37b952669bb9 (patch)
tree	269207a773c6bd1fd8383885e0c5649d70b34a62 /OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
parent	Access to these static methods to serialize objects are useful outside of ser... (diff)
parent	Update C5.dll to version 1.1.1 from 1.1.0 (diff)
download	opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.zip opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.gz opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.bz2 opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.xz

diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index ab383ef..3fd69ae 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
231		231
232	int userLevel = 0;	232	int userLevel = 0;
233	if (request.ContainsKey("UserLevel") && int.TryParse(request["UserLevel"].ToString(), out userLevel))	233	if (request.ContainsKey("UserLevel") && int.TryParse(request["UserLevel"].ToString(), out userLevel))
234	existingAccount.UserFlags = userLevel;	234	existingAccount.UserLevel = userLevel;
235		235
236	int userFlags = 0;	236	int userFlags = 0;
237	if (request.ContainsKey("UserFlags") && int.TryParse(request["UserFlags"].ToString(), out userFlags))	237	if (request.ContainsKey("UserFlags") && int.TryParse(request["UserFlags"].ToString(), out userFlags))