From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs | 4 ++-- .../ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/ApplicationPlugins/Rest/Regions') diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index 7fc1267..5102e3f 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using libsecondlife; @@ -65,7 +65,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions region_external_hostname = regInfo.ExternalHostName; if (!String.IsNullOrEmpty(regInfo.MasterAvatarFirstName)) - region_owner = String.Format("{0} {1}", regInfo.MasterAvatarFirstName, + region_owner = String.Format("{0} {1}", regInfo.MasterAvatarFirstName, regInfo.MasterAvatarLastName); } } diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 8a6fb09..0716cf6 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs @@ -23,7 +23,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* +* */ using System; @@ -57,12 +57,12 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions [Extension("/OpenSim/Startup")] public class RestRegionPlugin : RestPlugin { - private static readonly log4net.ILog _log = + private static readonly log4net.ILog _log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); #region overriding properties - public override string Name - { + public override string Name + { get { return "REGION"; } } @@ -86,7 +86,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions try { base.Initialise(openSim); - if (IsEnabled) + if (IsEnabled) m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); else m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); @@ -122,7 +122,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions StringWriter sw = new StringWriter(); XmlTextWriter xw = new XmlTextWriter(sw); xw.Formatting = Formatting.Indented; - + xw.WriteStartElement(String.Empty, "regions", String.Empty); foreach (Scene s in App.SceneManager.Scenes) { @@ -132,7 +132,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions } xw.WriteEndElement(); xw.Close(); - + return sw.ToString(); } @@ -154,7 +154,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions xs.Serialize(xw, new RegionDetails(scene.RegionInfo)); xw.Close(); - + return sw.ToString(); } #endregion methods -- cgit v1.1