diff options
| author | John Hurliman | 2010-03-26 11:08:14 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-03-26 11:08:14 -0700 |
| commit | dd1c1b3bcd89daf2cd47b79d8f46d70a9970f773 (patch) | |
| tree | 69a29c5f3f045acd456f8d3d6acef105d1f9b881 | |
| parent | replace recent IModule.GetGroup() with better GetGroupRecord(string name) (diff) | |
| download | opensim-SC_OLD-dd1c1b3bcd89daf2cd47b79d8f46d70a9970f773.zip opensim-SC_OLD-dd1c1b3bcd89daf2cd47b79d8f46d70a9970f773.tar.gz opensim-SC_OLD-dd1c1b3bcd89daf2cd47b79d8f46d70a9970f773.tar.bz2 opensim-SC_OLD-dd1c1b3bcd89daf2cd47b79d8f46d70a9970f773.tar.xz | |
Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one)
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6495899..7fed1ea 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1266,7 +1266,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1266 | 1266 | ||
| 1267 | UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last); | 1267 | UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last); |
| 1268 | 1268 | ||
| 1269 | if (account == null) | 1269 | if (account != null) |
| 1270 | { | 1270 | { |
| 1271 | account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty); | 1271 | account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty); |
| 1272 | if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0)) | 1272 | if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0)) |
| @@ -1325,7 +1325,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1325 | } | 1325 | } |
| 1326 | else | 1326 | else |
| 1327 | { | 1327 | { |
| 1328 | MainConsole.Instance.Output("You appear to be connected to a grid and can't create users from here. Please enter the name of an existing user"); | 1328 | MainConsole.Instance.Output("User account not found. Please enter the name of an existing user"); |
| 1329 | } | 1329 | } |
| 1330 | } | 1330 | } |
| 1331 | } | 1331 | } |