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

refactor: use EstateDataService property directly instead of loading it into a local variable

0.7.1-dev
Justin Clark-Casey (justincc) 2011-03-21 22:47:02 +00:00
parent 2d1f0d224c
commit ee7cfc2854
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,12 +798,8 @@ namespace OpenSim
/// <param name="regInfo"></param> /// <param name="regInfo"></param>
public void PopulateRegionEstateInfo(RegionInfo regInfo) public void PopulateRegionEstateInfo(RegionInfo regInfo)
{ {
IEstateDataService estateDataService = EstateDataService; if (EstateDataService != null)
regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, false);
if (estateDataService != null)
{
regInfo.EstateSettings = estateDataService.LoadEstateSettings(regInfo.RegionID, false);
}
if (regInfo.EstateSettings.EstateID == 0) // No record at all if (regInfo.EstateSettings.EstateID == 0) // No record at all
{ {
@ -814,7 +810,7 @@ namespace OpenSim
if (response == "no") if (response == "no")
{ {
// Create a new estate // Create a new estate
regInfo.EstateSettings = estateDataService.LoadEstateSettings(regInfo.RegionID, true); regInfo.EstateSettings = EstateDataService.LoadEstateSettings(regInfo.RegionID, true);
regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName); regInfo.EstateSettings.EstateName = MainConsole.Instance.CmdPrompt("New estate name", regInfo.EstateSettings.EstateName);
@ -828,7 +824,7 @@ namespace OpenSim
} }
else else
{ {
List<EstateSettings> estates = estateDataService.LoadEstateSettingsAll(); List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
List<string> estateNames = new List<string>(); List<string> estateNames = new List<string>();
foreach (EstateSettings estate in estates) foreach (EstateSettings estate in estates)
@ -843,7 +839,7 @@ namespace OpenSim
if (response == "None") if (response == "None")
continue; continue;
List<int> estateIDs = estateDataService.GetEstates(response); List<int> estateIDs = EstateDataService.GetEstates(response);
if (estateIDs.Count < 1) if (estateIDs.Count < 1)
{ {
MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again"); MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again");
@ -852,9 +848,9 @@ namespace OpenSim
int estateID = estateIDs[0]; int estateID = estateIDs[0];
regInfo.EstateSettings = estateDataService.LoadEstateSettings(estateID); regInfo.EstateSettings = EstateDataService.LoadEstateSettings(estateID);
if (estateDataService.LinkRegion(regInfo.RegionID, estateID)) if (EstateDataService.LinkRegion(regInfo.RegionID, estateID))
break; break;
MainConsole.Instance.Output("Joining the estate failed. Please try again."); MainConsole.Instance.Output("Joining the estate failed. Please try again.");
@ -863,7 +859,6 @@ namespace OpenSim
} }
} }
} }
public class OpenSimConfigSource public class OpenSimConfigSource
{ {