diff options
| author | Melanie | 2009-10-14 05:10:43 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-14 05:10:43 +0100 |
| commit | d83ace0d3ba3178aab852ae4ed63ea3953ea7c52 (patch) | |
| tree | 56575e321d60daaf36fa5b3261f4ed9154826566 /OpenSim/Services/Interfaces/IGridService.cs | |
| parent | * Split Task category into Task and State (diff) | |
| parent | Set the estate owner to be the master avatar if it's not set. (diff) | |
| download | opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.zip opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.tar.gz opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.tar.bz2 opensim-SC_OLD-d83ace0d3ba3178aab852ae4ed63ea3953ea7c52.tar.xz | |
Merge branch 'master' into htb-throttle
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 14560b1..e69e4cd 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
| @@ -200,6 +200,12 @@ namespace OpenSim.Services.Interfaces | |||
| 200 | Maturity = ConvertFrom.RegionSettings.Maturity; | 200 | Maturity = ConvertFrom.RegionSettings.Maturity; |
| 201 | RegionSecret = ConvertFrom.regionSecret; | 201 | RegionSecret = ConvertFrom.regionSecret; |
| 202 | EstateOwner = ConvertFrom.EstateSettings.EstateOwner; | 202 | EstateOwner = ConvertFrom.EstateSettings.EstateOwner; |
| 203 | if (EstateOwner == UUID.Zero) | ||
| 204 | { | ||
| 205 | EstateOwner = ConvertFrom.MasterAvatarAssignedUUID; | ||
| 206 | ConvertFrom.EstateSettings.EstateOwner = EstateOwner; | ||
| 207 | ConvertFrom.EstateSettings.Save(); | ||
| 208 | } | ||
| 203 | } | 209 | } |
| 204 | 210 | ||
| 205 | public GridRegion(GridRegion ConvertFrom) | 211 | public GridRegion(GridRegion ConvertFrom) |