diff options
| author | Melanie | 2012-01-02 21:41:36 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-02 21:41:36 +0000 |
| commit | a6e305063e9045194cd8348f73f3b75d07f3883e (patch) | |
| tree | c3287856ea47817715da89c737e3ccfe4d4c9f5d /OpenSim/Server | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff) | |
| download | opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.zip opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.gz opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.bz2 opensim-SC_OLD-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 2 |
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 | |||
| 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)) |