diff options
| author | UbitUmarov | 2018-03-20 10:09:22 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-03-20 10:09:22 +0000 |
| commit | e733bfb3b53b120136295fff234d51e05430b841 (patch) | |
| tree | 91b0c72df649129726297442b575d5a03ab18848 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | mantis 8257: fix the default realm (ie table name) of AuthenticationService (diff) | |
| download | opensim-SC-e733bfb3b53b120136295fff234d51e05430b841.zip opensim-SC-e733bfb3b53b120136295fff234d51e05430b841.tar.gz opensim-SC-e733bfb3b53b120136295fff234d51e05430b841.tar.bz2 opensim-SC-e733bfb3b53b120136295fff234d51e05430b841.tar.xz | |
fix merge issue
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 757e255..7a221c4 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -477,7 +477,7 @@ namespace OpenSim | |||
| 477 | 477 | ||
| 478 | if (scene.SnmpService != null) | 478 | if (scene.SnmpService != null) |
| 479 | { | 479 | { |
| 480 | scene.SnmpService.BootInfo("Loading prins", scene); | 480 | scene.SnmpService.BootInfo("Loading prims", scene); |
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) | 483 | while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) |