OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2012-05-10 20:33:27 +01:00
parent a90822f4b8 de44734fe9
commit 8558a36506
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -122,8 +122,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
Thread.CurrentThread.ManagedThreadId.ToString() + Thread.CurrentThread.ManagedThreadId.ToString() +
")"); ")");
m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]); bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
m_openSim.CreateRegion(regionsToLoad[i], true, out scene); m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
if (changed)
regionsToLoad[i].EstateSettings.Save(); regionsToLoad[i].EstateSettings.Save();
if (scene != null) if (scene != null)

3
OpenSim/Region/Application/OpenSim.cs
View File

@ -618,9 +618,10 @@ namespace OpenSim
return; return;
} }
PopulateRegionEstateInfo(regInfo); bool changed = PopulateRegionEstateInfo(regInfo);
IScene scene; IScene scene;
CreateRegion(regInfo, true, out scene); CreateRegion(regInfo, true, out scene);
if (changed)
regInfo.EstateSettings.Save(); regInfo.EstateSettings.Save();
} }

8
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -1060,13 +1060,13 @@ namespace OpenSim
/// Load the estate information for the provided RegionInfo object. /// Load the estate information for the provided RegionInfo object.
/// </summary> /// </summary>
/// <param name="regInfo"></param> /// <param name="regInfo"></param>
public void PopulateRegionEstateInfo(RegionInfo regInfo) public bool PopulateRegionEstateInfo(RegionInfo regInfo)
{ {
if (EstateDataService != null) if (EstateDataService != null)
regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false); regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
if (regInfo.EstateSettings.EstateID != 0) if (regInfo.EstateSettings.EstateID != 0)
return; return false; // estate info in the database did not change
m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName); m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
@ -1101,7 +1101,7 @@ namespace OpenSim
} }
if (defaultEstateJoined) if (defaultEstateJoined)
return; return true; // need to update the database
else else
m_log.ErrorFormat( m_log.ErrorFormat(
"[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName); "[OPENSIM BASE]: Joining default estate {0} failed", defaultEstateName);
@ -1164,6 +1164,8 @@ namespace OpenSim
} }
} }
} }
return true; // need to update the database
} }
} }