diff options
| author | Diva Canto | 2010-01-10 15:35:15 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 15:35:15 -0800 |
| commit | c0642bf7e06924397894229677235e2a841768bc (patch) | |
| tree | 3d052597318fd29e107662ab29bb831ff8380582 /OpenSim/Services | |
| parent | * Changed IPresenceService Logout, so that it takes a position and a lookat (diff) | |
| parent | Remove all references to master avatar, replacing with estate owner where (diff) | |
| download | opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.zip opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.gz opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.bz2 opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 5ea136f..cd27145 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -204,12 +204,6 @@ namespace OpenSim.Services.Interfaces | |||
| 204 | Maturity = ConvertFrom.RegionSettings.Maturity; | 204 | Maturity = ConvertFrom.RegionSettings.Maturity; |
| 205 | RegionSecret = ConvertFrom.regionSecret; | 205 | RegionSecret = ConvertFrom.regionSecret; |
| 206 | EstateOwner = ConvertFrom.EstateSettings.EstateOwner; | 206 | EstateOwner = ConvertFrom.EstateSettings.EstateOwner; |
| 207 | if (EstateOwner == UUID.Zero) | ||
| 208 | { | ||
| 209 | EstateOwner = ConvertFrom.MasterAvatarAssignedUUID; | ||
| 210 | ConvertFrom.EstateSettings.EstateOwner = EstateOwner; | ||
| 211 | ConvertFrom.EstateSettings.Save(); | ||
| 212 | } | ||
| 213 | } | 207 | } |
| 214 | 208 | ||
| 215 | public GridRegion(GridRegion ConvertFrom) | 209 | public GridRegion(GridRegion ConvertFrom) |