diff options
| author | Melanie | 2010-08-10 20:12:13 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-10 20:12:13 +0100 |
| commit | 5e8c3f832519246956b28d98d2c46b7c108b1cd1 (patch) | |
| tree | 4ae3aa72d8ff0d0867c4f7f6974da2c7c0d2c505 | |
| parent | Resolve merge issues (diff) | |
| parent | remoning debug messages (diff) | |
| download | opensim-SC_OLD-5e8c3f832519246956b28d98d2c46b7c108b1cd1.zip opensim-SC_OLD-5e8c3f832519246956b28d98d2c46b7c108b1cd1.tar.gz opensim-SC_OLD-5e8c3f832519246956b28d98d2c46b7c108b1cd1.tar.bz2 opensim-SC_OLD-5e8c3f832519246956b28d98d2c46b7c108b1cd1.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index ee151da..c6a1614 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -949,7 +949,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 949 | break; | 949 | break; |
| 950 | } | 950 | } |
| 951 | m_scene.RegionInfo.RegionSettings.Save(); | 951 | m_scene.RegionInfo.RegionSettings.Save(); |
| 952 | TriggerRegionInfoChange(); | 952 | //TriggerRegionInfoChange(); |
| 953 | TriggerEstateInfoChange(); | ||
| 953 | sendRegionInfoPacketToAll(); | 954 | sendRegionInfoPacketToAll(); |
| 954 | 955 | ||
| 955 | } | 956 | } |
| @@ -995,7 +996,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 995 | break; | 996 | break; |
| 996 | } | 997 | } |
| 997 | m_scene.RegionInfo.RegionSettings.Save(); | 998 | m_scene.RegionInfo.RegionSettings.Save(); |
| 998 | TriggerRegionInfoChange(); | 999 | //TriggerRegionInfoChange(); |
| 1000 | TriggerEstateInfoChange(); | ||
| 999 | sendRegionHandshakeToAll(); | 1001 | sendRegionHandshakeToAll(); |
| 1000 | } | 1002 | } |
| 1001 | } | 1003 | } |