diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs index b89976f1ee..81eb5bd868 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs @@ -1,30 +1,29 @@ /* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* 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. -* -*/ + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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; using System.Threading; @@ -54,10 +53,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions public partial class RestRegionPlugin : RestPlugin { #region GET methods - public string GetHandler(string request, string path, string param, + public string GetHandler(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { - // foreach (string h in httpRequest.Headers.AllKeys) + // foreach (string h in httpRequest.Headers.AllKeys) // foreach (string v in httpRequest.Headers.GetValues(h)) // m_log.DebugFormat("{0} IsGod: {1} -> {2}", MsgID, h, v); @@ -72,7 +71,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions // param not empty: specific region return GetHandlerRegion(httpResponse, param); } - catch (Exception e) + catch (Exception e) { return Failure(httpResponse, OSHttpStatusCode.ServerErrorInternalError, "GET", e); } @@ -88,7 +87,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions XmlWriter.WriteEndElement(); } XmlWriter.WriteEndElement(); - + return XmlWriterResult; } @@ -141,7 +140,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions // m_log.DebugFormat("{0} GET comps advanced: >{1}<", MsgID, comps[1]); // check for {terrain,stats,prims} - switch (comps[1].ToLower()) + switch (comps[1].ToLower()) { case "terrain": return RegionTerrain(httpResponse, scene); @@ -175,13 +174,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions XmlWriter.WriteStartElement(String.Empty, "users", String.Empty); XmlWriter.WriteString(users.ToString()); XmlWriter.WriteEndElement(); - + XmlWriter.WriteStartElement(String.Empty, "objects", String.Empty); XmlWriter.WriteString(objects.ToString()); XmlWriter.WriteEndElement(); XmlWriter.WriteEndDocument(); - + return XmlWriterResult; } diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs index 00fe0d2596..e6131f1393 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs @@ -1,30 +1,29 @@ /* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* 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. -* -*/ + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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; using System.Threading; @@ -54,10 +53,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions public partial class RestRegionPlugin : RestPlugin { #region POST methods - public string PostHandler(string request, string path, string param, + public string PostHandler(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { - // foreach (string h in httpRequest.Headers.AllKeys) + // foreach (string h in httpRequest.Headers.AllKeys) // foreach (string v in httpRequest.Headers.GetValues(h)) // m_log.DebugFormat("{0} IsGod: {1} -> {2}", MsgID, h, v); @@ -67,17 +66,17 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions try { // param empty: new region post - if (!IsGod(httpRequest)) + if (!IsGod(httpRequest)) // XXX: this needs to be turned into a FailureUnauthorized(...) return Failure(httpResponse, OSHttpStatusCode.ClientErrorUnauthorized, "GET", "you are not god"); if (String.IsNullOrEmpty(param)) return CreateRegion(httpRequest, httpResponse); - return Failure(httpResponse, OSHttpStatusCode.ClientErrorNotFound, + return Failure(httpResponse, OSHttpStatusCode.ClientErrorNotFound, "POST", "url {0} not supported", param); } - catch (Exception e) + catch (Exception e) { return Failure(httpResponse, OSHttpStatusCode.ServerErrorInternalError, "POST", e); } @@ -93,7 +92,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions XmlWriter.WriteEndElement(); } XmlWriter.WriteEndElement(); - + return XmlWriterResult; } #endregion POST methods diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs index c86c67f4ed..5de623ca78 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs @@ -1,30 +1,29 @@ /* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* 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. -* -*/ + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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; using System; @@ -65,35 +64,35 @@ 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); } public string this[string idx] { - get + get { switch(idx.ToLower()) { - case "name": + case "name": return region_name; - case "id": + case "id": return region_id; - case "location": + case "location": return String.Format("{0}{1}", region_x, region_y); - case "owner": + case "owner": return region_owner; - case "owner_id": + case "owner_id": return region_owner_id; - case "http_port": + case "http_port": return region_http_port.ToString(); - case "server_uri": + case "server_uri": return region_server_uri; case "external_hostname": - case "hostname": + case "hostname": return region_external_hostname; - default: + default: return null; } } diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index 6d585a4d25..24bed993e5 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs @@ -1,30 +1,29 @@ /* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* 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. -* -*/ + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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; using System.Threading; @@ -58,8 +57,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions public partial class RestRegionPlugin : RestPlugin { #region overriding properties - public override string Name - { + public override string Name + { get { return "REGION"; } } @@ -83,7 +82,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions try { base.Initialise(openSim); - if (!IsEnabled) + if (!IsEnabled) { m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); return; diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index f1ca83d28e..c502e28e44 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs @@ -1,30 +1,29 @@ /* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSim Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* 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. -* -*/ + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * 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; using System.Threading; @@ -56,7 +55,7 @@ namespace OpenSim.ApplicationPlugins.Rest { #region properties - protected static readonly log4net.ILog m_log = + protected static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private IConfig _config; // Configuration source: Rest Plugins @@ -106,8 +105,8 @@ namespace OpenSim.ApplicationPlugins.Rest /// public bool IsEnabled { - get - { + get + { return (null != _pluginConfig) && _pluginConfig.GetBoolean("enabled", false); } } @@ -115,7 +114,7 @@ namespace OpenSim.ApplicationPlugins.Rest /// /// OpenSimMain application /// - public OpenSimMain App + public OpenSimMain App { get { return _app; } } @@ -123,7 +122,7 @@ namespace OpenSim.ApplicationPlugins.Rest /// /// RPC server /// - public BaseHttpServer HttpServer + public BaseHttpServer HttpServer { get { return _httpd; } } @@ -156,7 +155,7 @@ namespace OpenSim.ApplicationPlugins.Rest public XmlTextWriter XmlWriter { - get { + get { if (null == _xw) { _sw = new StringWriter(); @@ -200,7 +199,7 @@ namespace OpenSim.ApplicationPlugins.Rest return; } - if (!_config.GetBoolean("enabled", false)) + if (!_config.GetBoolean("enabled", false)) { m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); return; @@ -211,14 +210,14 @@ namespace OpenSim.ApplicationPlugins.Rest // Retrieve GOD key value, if any. _godkey = _config.GetString("god_key", String.Empty); - + // Retrive prefix if any. _prefix = _config.GetString("prefix", "/admin"); - + // Get plugin specific config _pluginConfig = openSim.ConfigSource.Configs[ConfigName]; - + m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); } catch (Exception e) @@ -231,7 +230,7 @@ namespace OpenSim.ApplicationPlugins.Rest // not possible for the openSim pointer to be null. However // were the implementation to be changed, this could // result in a silent initialization failure. Harmless - // except for lack of function and lack of any + // except for lack of function and lack of any // diagnostic indication as to why. The same is true if // the HTTP server reference is bad. // We should at least issue a message... @@ -254,7 +253,7 @@ namespace OpenSim.ApplicationPlugins.Rest { if (!IsEnabled) return; - if (!path.StartsWith(_prefix)) + if (!path.StartsWith(_prefix)) { path = String.Format("{0}{1}", _prefix, path); } @@ -354,7 +353,7 @@ namespace OpenSim.ApplicationPlugins.Rest /// origin of the failure message /// failure message /// This should probably set a return code as - /// well. (?) + /// well. (?) protected string Failure(OSHttpResponse response, OSHttpStatusCode status, string method, string format, params string[] msg) { @@ -373,8 +372,8 @@ namespace OpenSim.ApplicationPlugins.Rest /// origin of the failure message /// exception causing the failure message /// This should probably set a return code as - /// well. (?) - public string Failure(OSHttpResponse response, OSHttpStatusCode status, + /// well. (?) + public string Failure(OSHttpResponse response, OSHttpStatusCode status, string method, Exception e) { string m = String.Format("exception occurred: {0}", e.Message); diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 745583f464..bcfd7c35a6 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -95,7 +95,9 @@ namespace OpenSim.Data.MySQL settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; database = new MySQLManager(m_connectString); - } else { + } + else + { m_connectString = connect; m_agentsTableName = "agents"; m_usersTableName = "users"; @@ -190,7 +192,7 @@ namespace OpenSim.Data.MySQL { database.ExecuteResourceSql("CreateAvatarAppearance.sql"); return; - } + } else if (oldVersion.Contains("Rev.1")) { database.ExecuteSql("drop table avatarappearance"); @@ -674,15 +676,15 @@ namespace OpenSim.Data.MySQL { Dictionary param = new Dictionary(); param["?owner"] = user.ToString(); - + IDbCommand result = database.Query("SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param); IDataReader reader = result.ExecuteReader(); - + AvatarAppearance appearance = database.readAppearanceRow(reader); - + reader.Close(); result.Dispose(); - + return appearance; } } diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs index 07bea9d246..0507173273 100644 --- a/OpenSim/Framework/Communications/CAPSService.cs +++ b/OpenSim/Framework/Communications/CAPSService.cs @@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications m_server.AddStreamHandler(new RestStreamHandler("POST", path, restMethod)); } - public string CapsRequest(string request, string path, string param, + public string CapsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { System.Console.WriteLine("new caps request " + request + " from path " + path); diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 8d8f945c4d..c2b004604d 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -211,7 +211,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// HTTP request header object /// HTTP response header object /// - public string CapsRequest(string request, string path, string param, + public string CapsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); @@ -509,7 +509,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// HTTP request header object /// HTTP response header object /// - public string ScriptTaskInventory(string request, string path, string param, + public string ScriptTaskInventory(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { try @@ -564,7 +564,7 @@ namespace OpenSim.Framework.Communications.Capabilities /// /// /// - public string NoteCardAgentInventory(string request, string path, string param, + public string NoteCardAgentInventory(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs index c5cb2682a6..36090e1f15 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs @@ -44,7 +44,7 @@ namespace OpenSim.Framework.Communications.Capabilities m_method = method; } - public override byte[] Handle(string path, Stream request, + public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { //Encoding encoding = Encoding.UTF8; diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 23969fef9d..27ce4333f2 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -73,9 +73,9 @@ namespace OpenSim.Framework public class PrimitiveBaseShape { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + private static readonly LLObject.TextureEntry m_defaultTexture; - + private byte[] m_textureEntry; public ushort PathBegin; @@ -93,39 +93,39 @@ namespace OpenSim.Framework public sbyte PathTwist; public sbyte PathTwistBegin; public byte PCode; - public ushort ProfileBegin; - + public ushort ProfileBegin; + public byte ProfileCurve { get { return (byte)((byte)HollowShape | (byte)ProfileShape); } - - set + + set { // Handle hollow shape component byte hollowShapeByte = (byte)(value & 0xf0); - + if (!Enum.IsDefined(typeof(HollowShape), hollowShapeByte)) { m_log.WarnFormat( "[SHAPE]: Attempt to set a ProfileCurve with a hollow shape value of {0}, which isn't a valid enum. Replacing with default shape.", hollowShapeByte); - + this.HollowShape = HollowShape.Same; } else { this.HollowShape = (HollowShape)hollowShapeByte; } - + // Handle profile shape component byte profileShapeByte = (byte)(value & 0xf); - + if (!Enum.IsDefined(typeof(ProfileShape), profileShapeByte)) { m_log.WarnFormat( "[SHAPE]: Attempt to set a ProfileCurve with a profile shape value of {0}, which isn't a valid enum. Replacing with square.", profileShapeByte); - + this.ProfileShape = ProfileShape.Square; } else @@ -133,13 +133,13 @@ namespace OpenSim.Framework this.ProfileShape = (ProfileShape)profileShapeByte; } } - } + } public ushort ProfileEnd; public ushort ProfileHollow; public LLVector3 Scale; public byte State; - + // Sculpted [XmlIgnore] public LLUUID SculptTexture = LLUUID.Zero; [XmlIgnore] public byte SculptType = (byte)0; @@ -154,7 +154,7 @@ namespace OpenSim.Framework [XmlIgnore] public float FlexiForceX = 0f; [XmlIgnore] public float FlexiForceY = 0f; [XmlIgnore] public float FlexiForceZ = 0f; - + //Bright n sparkly [XmlIgnore] public float LightColorR = 0f; [XmlIgnore] public float LightColorG = 0f; @@ -198,8 +198,8 @@ namespace OpenSim.Framework } public ProfileShape ProfileShape; - - public HollowShape HollowShape; + + public HollowShape HollowShape; public static PrimitiveBaseShape Default { @@ -394,7 +394,7 @@ namespace OpenSim.Framework returnbyte[0] = 0; return returnbyte; } - + return returnbytes; //m_log.Info("[EXTRAPARAMS]: Length = " + m_shape.ExtraParams.Length.ToString()); @@ -451,11 +451,11 @@ namespace OpenSim.Framework int i = 0; byte extraParamCount = data[i++]; - + for (int k = 0; k < extraParamCount; k++) { ushort epType = Helpers.BytesToUInt16(data, i); - + i += 2; uint paramLength = Helpers.BytesToUIntBig(data, i); @@ -611,7 +611,7 @@ namespace OpenSim.Framework // Alpha channel in color is intensity LLColor tmpColor = new LLColor(LightColorR,LightColorG,LightColorB,LightIntensity); - + tmpColor.GetBytes().CopyTo(data, 0); Helpers.FloatToBytes(LightRadius).CopyTo(data, 4); Helpers.FloatToBytes(LightCutoff).CopyTo(data, 8); diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 91b57183c5..fa64b41b4d 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -164,8 +164,8 @@ namespace OpenSim.Framework.Servers if (TryGetAgentHandler(request, response, out agentHandler)) { // m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent); - if(HandleAgentRequest(agentHandler, request, response)) - return; + if (HandleAgentRequest(agentHandler, request, response)) + return; } } @@ -177,22 +177,22 @@ namespace OpenSim.Framework.Servers string handlerKey = GetHandlerKey(request.HttpMethod, path); //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); - + if (TryGetStreamHandler(handlerKey, out requestHandler)) { - + // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. byte[] buffer; if (requestHandler is IStreamedRequestHandler) { IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler; - + buffer = streamedRequestHandler.Handle(path, request.InputStream, request, response); } else { IStreamHandler streamHandler = (IStreamHandler) requestHandler; - + using (MemoryStream memoryStream = new MemoryStream()) { streamHandler.Handle(path, request.InputStream, memoryStream, request, response); @@ -200,11 +200,11 @@ namespace OpenSim.Framework.Servers buffer = memoryStream.ToArray(); } } - + request.InputStream.Close(); if (!response.IsContentTypeSet) response.ContentType = requestHandler.ContentType; response.ContentLength64 = buffer.LongLength; - + try { response.OutputStream.Write(buffer, 0, buffer.Length); @@ -216,7 +216,7 @@ namespace OpenSim.Framework.Servers } return; } - + switch (request.ContentType) { case null: @@ -479,7 +479,7 @@ namespace OpenSim.Framework.Servers private bool HandleAgentRequest(IHttpAgentHandler handler, OSHttpRequest request, OSHttpResponse response) { - // In the case of REST, then handler is responsible for ALL aspects of + // In the case of REST, then handler is responsible for ALL aspects of // the request/response handling. Nothing is done here, not even encoding. try diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs index a81a1b7902..6b0614fbdc 100644 --- a/OpenSim/Framework/Servers/BaseStreamHandler.cs +++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs @@ -32,7 +32,7 @@ namespace OpenSim.Framework.Servers { public abstract class BaseStreamHandler : BaseRequestHandler, IStreamedRequestHandler { - public abstract byte[] Handle(string path, Stream request, + public abstract byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse); protected BaseStreamHandler(string httpMethod, string path) : base(httpMethod, path) diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index 212e224964..a290e0e40b 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs @@ -55,7 +55,7 @@ namespace OpenSim.Framework.Servers get { return _acceptTypes; } } - public Encoding ContentEncoding + public Encoding ContentEncoding { get { return _contentEncoding; } } @@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers get { return _url; } } - public string UserAgent + public string UserAgent { get { return _userAgent; } } diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs index 28d513acba..72be7901c1 100644 --- a/OpenSim/Framework/Servers/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/OSHttpResponse.cs @@ -36,36 +36,36 @@ namespace OpenSim.Framework.Servers { private string _contentType; private bool _contentTypeSet; - public string ContentType + public string ContentType { get { return _contentType; } - set + set { _contentType = value; _contentTypeSet = true; } } - public bool IsContentTypeSet + public bool IsContentTypeSet { get { return _contentTypeSet; } } private long _contentLength64; - public long ContentLength64 + public long ContentLength64 { get { return _contentLength64; } - set + set { _contentLength64 = value; if (null != _resp) _resp.ContentLength64 = value; } } - + private Encoding _contentEncoding; - public Encoding ContentEncoding + public Encoding ContentEncoding { get { return _contentEncoding; } - set + set { _contentEncoding = value; if (null != _resp) _resp.ContentEncoding = value; @@ -76,10 +76,10 @@ namespace OpenSim.Framework.Servers public CookieCollection Cookies; private bool _keepAlive; - public bool KeepAlive + public bool KeepAlive { get { return _keepAlive; } - set + set { _keepAlive = value; if (null != _resp) _resp.KeepAlive = value; @@ -92,7 +92,7 @@ namespace OpenSim.Framework.Servers public string RedirectLocation { get { return _redirectLocation; } - set + set { _redirectLocation = value; if (null != _resp) _resp.RedirectLocation = value; @@ -103,7 +103,7 @@ namespace OpenSim.Framework.Servers public bool SendChunked { get { return _sendChunked; } - set + set { _sendChunked = value; if (null != _resp) _resp.SendChunked = value; @@ -111,10 +111,10 @@ namespace OpenSim.Framework.Servers } private int _statusCode; - public int StatusCode + public int StatusCode { get { return _statusCode; } - set + set { _statusCode = value; if (null != _resp) _resp.StatusCode = value; @@ -122,10 +122,10 @@ namespace OpenSim.Framework.Servers } private string _statusDescription; - public string StatusDescription + public string StatusDescription { get { return _statusDescription; } - set + set { _statusDescription = value; if (null != _resp) _resp.StatusDescription = value; diff --git a/OpenSim/Framework/Servers/OSHttpStatusCodes.cs b/OpenSim/Framework/Servers/OSHttpStatusCodes.cs index 9a04d82cf0..42f172bcb5 100644 --- a/OpenSim/Framework/Servers/OSHttpStatusCodes.cs +++ b/OpenSim/Framework/Servers/OSHttpStatusCodes.cs @@ -41,13 +41,13 @@ namespace OpenSim.Framework.Servers // application level protocol InfoSwitchingProtocols = 101, - + // 2xx Success codes // 200 Request successful SuccessOk = 200, // 201 Request successful, new resource created SuccessOkCreated = 201, - // 202 Request accepted, processing still on-going + // 202 Request accepted, processing still on-going SuccessOkAccepted = 202, // 203 Request successful, meta information not authoritative SuccessOkNonAuthoritativeInformation = 203, @@ -60,7 +60,7 @@ namespace OpenSim.Framework.Servers // 3xx Redirect code: user agent needs to go somewhere else // 300 Redirect: different presentation forms available, take - // a pick + // a pick RedirectMultipleChoices = 300, // 301 Redirect: requested resource has moved and now lives // somewhere else @@ -78,7 +78,7 @@ namespace OpenSim.Framework.Servers // 307 Redirect: Resource temporarily somewhere else, location // might change RedirectMovedTemporarily = 307, - + // 4xx Client error: the client borked the request // 400 Client error: bad request, server does not grok what // the client wants @@ -92,7 +92,7 @@ namespace OpenSim.Framework.Servers // deliver, do not try again. ClientErrorForbidden = 403, // 404 Client error: Server cannot find anything matching the - // client request. + // client request. ClientErrorNotFound = 404, // 405 Client error: The method specified by the client in the // request is not allowed for the resource requested @@ -148,7 +148,7 @@ namespace OpenSim.Framework.Servers // 501 Server error: The server does not do the functionality // required to carry out the client request. not at // all. certainly not before breakfast. but also not after - // breakfast. + // breakfast. ServerErrorNotImplemented = 501, // 502 Server error: While acting as a proxy or a gateway, the // server got ditched by the upstream server and as a diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs index fcc8839fec..99358aa51d 100644 --- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs @@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers m_method = method; } - public void Handle(string path, Stream request, Stream responseStream, + public void Handle(string path, Stream request, Stream responseStream, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { TRequest deserial; diff --git a/OpenSim/Framework/Servers/RestMethod.cs b/OpenSim/Framework/Servers/RestMethod.cs index 6bd34f54bb..e58e2703bd 100644 --- a/OpenSim/Framework/Servers/RestMethod.cs +++ b/OpenSim/Framework/Servers/RestMethod.cs @@ -27,6 +27,6 @@ namespace OpenSim.Framework.Servers { - public delegate string RestMethod(string request, string path, string param, + public delegate string RestMethod(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse); } diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index c776c36cbf..e0e5656fb1 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -60,7 +60,7 @@ namespace OpenSim.Grid.AssetServer m_assetProvider = assetProvider; } - public override byte[] Handle(string path, Stream request, + public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); @@ -123,7 +123,7 @@ namespace OpenSim.Grid.AssetServer private OpenAsset_Main m_assetManager; private IAssetProvider m_assetProvider; - public override byte[] Handle(string path, Stream request, + public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 5a6a3280ce..d0eec3245f 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -880,7 +880,7 @@ namespace OpenSim.Grid.GridServer /// HTTP request header object /// HTTP response header object /// - public string RestGetRegionMethod(string request, string path, string param, + public string RestGetRegionMethod(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); @@ -895,7 +895,7 @@ namespace OpenSim.Grid.GridServer /// HTTP request header object /// HTTP response header object /// - public string RestSetRegionMethod(string request, string path, string param, + public string RestSetRegionMethod(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse); @@ -910,7 +910,7 @@ namespace OpenSim.Grid.GridServer /// HTTP request header object /// HTTP response header object /// Information about the sim in XML - public string RestGetSimMethod(string request, string path, string param, + public string RestGetSimMethod(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string respstring = String.Empty; @@ -958,7 +958,7 @@ namespace OpenSim.Grid.GridServer /// HTTP request header object /// HTTP response header object /// "OK" or an error - public string RestSetSimMethod(string request, string path, string param, + public string RestSetSimMethod(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { Console.WriteLine("Processing region update via REST method"); diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index a5b256d3a7..efe077d46a 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs @@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer } - public override byte[] Handle(string path, Stream request, + public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); @@ -86,7 +86,7 @@ namespace OpenSim.Grid.MessagingServer { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public override byte[] Handle(string path, Stream request, + public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { string param = GetParam(path); diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 3c9d65098c..628c4714e0 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -119,7 +119,9 @@ namespace OpenSim.Grid.UserServer RegionProfileData.RequestSimProfileData( theUser.HomeRegion, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); - } else { + } + else + { start_x = Convert.ToInt32(startLocationRequestParsed[1]); start_y = Convert.ToInt32(startLocationRequestParsed[2]); start_z = Convert.ToInt32(startLocationRequestParsed[3]); diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 706f461505..a82505da11 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs @@ -57,7 +57,7 @@ namespace OpenSim.Grid.UserServer /// HTTP request header object /// HTTP response header object /// Success "OK" else error - public string RestDeleteUserSessionMethod(string request, string path, string param, + public string RestDeleteUserSessionMethod(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { // TODO! Important! @@ -260,11 +260,14 @@ namespace OpenSim.Grid.UserServer if (requestData.Contains("owner")) { appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); - if (appearance == null) { + if (appearance == null) + { responseData = new Hashtable(); responseData["error_type"] = "no appearance"; responseData["error_desc"] = "There was no appearance found for this avatar"; - } else { + } + else + { responseData = appearance.ToHashTable(); } } diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index cf12be7d07..dec0311493 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -66,7 +66,7 @@ namespace OpenSim /// The file used to load and save prim backup xml if none has been specified /// protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; - + /// /// The file use to load and save an opensim archive if none has been specified /// @@ -354,7 +354,7 @@ namespace OpenSim } /// - /// Enhance the version string with extra information if it's available. + /// Enhance the version string with extra information if it's available. /// protected void EnhanceVersionInformation() { @@ -387,7 +387,7 @@ namespace OpenSim if (!string.IsNullOrEmpty(buildVersion)) { VersionInfo.Version += ", SVN build r" + buildVersion; - } + } else { VersionInfo.Version += ", SVN build revision not available"; @@ -407,9 +407,9 @@ namespace OpenSim if (OSString.Length > 45) { OSString = OSString.Substring(0, 45); - } - - VersionInfo.Version += ", OS " + OSString; + } + + VersionInfo.Version += ", OS " + OSString; } /// @@ -418,7 +418,7 @@ namespace OpenSim protected void InternalStartUp() { EnhanceVersionInformation(); - + m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n"); m_stats = StatsManager.StartCollectingSimExtraStats(); @@ -710,7 +710,7 @@ namespace OpenSim /// protected class SimStatusHandler : IStreamedRequestHandler { - public byte[] Handle(string path, Stream request, + public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return Encoding.UTF8.GetBytes("OK"); diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index dd14c59bca..e4590f27e7 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs @@ -291,7 +291,7 @@ namespace OpenSim break; case "save-xml": m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); - + if (cmdparams.Length > 0) { m_sceneManager.SaveCurrentSceneToXml(cmdparams[0]); @@ -304,7 +304,7 @@ namespace OpenSim case "load-xml": m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); - + LLVector3 loadOffset = new LLVector3(0, 0, 0); if (cmdparams.Length > 0) { @@ -359,10 +359,10 @@ namespace OpenSim m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); } break; - + case "save-oar": m_log.Error("[CONSOLE]: Don't use me - I haven't yet been sufficiently implemented!"); - + if (cmdparams.Length > 0) { m_sceneManager.SaveCurrentSceneToArchive(cmdparams[0]); @@ -371,7 +371,7 @@ namespace OpenSim { m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); } - break; + break; case "plugin": m_sceneManager.SendCommandToPluginModules(cmdparams); @@ -597,9 +597,9 @@ namespace OpenSim case "users": IList agents = m_sceneManager.GetCurrentSceneAvatars(); - + m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); - + m_console.Notice( String.Format("{0,-16}{1,-16}{2,-37}{3,-16}", "Firstname", "Lastname", "Agent ID","Region")); @@ -627,7 +627,7 @@ namespace OpenSim presence.UUID, regionName)); } - + m_console.Notice(""); break; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 11fb5beb1f..e27a0032f5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -98,7 +98,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP private Dictionary m_defaultAnimations = new Dictionary(); - /* protected variables */ protected static Dictionary PacketHandlers = @@ -413,7 +412,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP Thread.Sleep(2000); - // Shut down timers m_ackTimer.Stop(); m_clientPingTimer.Stop(); @@ -782,7 +780,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event TeleportLocationRequest OnSetStartLocationRequest; public event UpdateAvatarProperties OnUpdateAvatarProperties; - public event CreateNewInventoryItem OnCreateNewInventoryItem; public event CreateInventoryFolder OnCreateNewInventoryFolder; public event UpdateInventoryFolder OnUpdateInventoryFolder; @@ -937,13 +934,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// /// - public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, + public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible) { SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID, source, audible); } - public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, + public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID, byte source, byte audible) { ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); @@ -3172,7 +3169,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public bool HandleObjectGroupRequest(IClientAPI sender, Packet Pack) { - + ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; handlerObjectGroupRequest = OnObjectGroupRequest; if (handlerObjectGroupRequest != null) @@ -3185,7 +3182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP return true; } - + private bool HandleViewerEffect(IClientAPI sender, Packet Pack) { @@ -3875,7 +3872,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } else { - + switch (Pack.Type) { #region Scene/Avatar @@ -5427,10 +5424,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP } break; case PacketType.ParcelReturnObjects: - + ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; - + LLUUID[] puserselectedOwnerIDs = new LLUUID[parcelReturnObjects.OwnerIDs.Length]; for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; @@ -5444,10 +5441,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (handlerParcelReturnObjectsRequest != null) { handlerParcelReturnObjectsRequest(parcelReturnObjects.ParcelData.LocalID,parcelReturnObjects.ParcelData.ReturnType,puserselectedOwnerIDs,puserselectedTaskIDs, this); - + } break; - + #endregion #region Estate Packets @@ -5666,7 +5663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP break; case PacketType.LandStatRequest: LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; - + handlerLandStatRequest = OnLandStatRequest; if (handlerLandStatRequest != null) { @@ -5678,7 +5675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //lsrp.RequestData.ReportType; // 1 = colliders, 0 = scripts //lsrp.RequestData.RequestFlags; //lsrp.RequestData.Filter; - + break; case PacketType.RequestRegionInfo: diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index fb14a359a2..37864893a3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs @@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { public class LLPacketQueue : IPullStatsProvider { - private static readonly log4net.ILog m_log + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private bool m_enabled = true; @@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_log.Warn("[PACKET QUEUE]: SetThrottleFromClient unexpectedly received a throttle byte array containing no elements!"); return; } - + int tResend = -1; int tLand = -1; int tWind = -1; diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 6ecae06bb0..7ddd0729bf 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs @@ -60,7 +60,7 @@ namespace OpenSim.Region.DataSnapshot //Register CAPS handler event m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; - + //harbl } @@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); } - public string OnDiscoveryAttempt(string request, string path, string param, + public string OnDiscoveryAttempt(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { //Very static for now, flexible enough to add new formats @@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL(); llsd_dataurl.snapshot_format = "os-datasnapshot-v1"; llsd_dataurl.snapshot_url = "http://" + m_externalData.m_hostname + ":" + m_externalData.m_listener_port + "/?method=collector"; - + llsd_response.snapshot_resources.Array.Add(llsd_dataurl); string response = LLSDHelpers.SerialiseLLSDReply(llsd_response); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 82162229f3..9730b02aa9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat { public class ChatModule : IRegionModule, ISimChat { - private static readonly ILog m_log = + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private const int DEBUG_CHANNEL = 2147483647; @@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // Filled in since it's easier than rewriting right now. LLVector3 fromPos = e.Position; - LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, + LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); string fromName = e.From; @@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (avatar != null) { fromPos = avatar.AbsolutePosition; - regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, + regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); fromName = avatar.Firstname + " " + avatar.Lastname; fromAgentID = e.Sender.AgentId; @@ -151,13 +151,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (e.Channel == DEBUG_CHANNEL) { TrySendChatMessage(presence, fromPos, regionPos, - fromAgentID, fromName, e.Type, + fromAgentID, fromName, e.Type, message, ChatSourceType.Object); } else { TrySendChatMessage(presence, fromPos, regionPos, - fromAgentID, fromName, e.Type, + fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); } }); @@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat } private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, - LLUUID fromAgentID, string fromName, ChatTypeEnum type, + LLUUID fromAgentID, string fromName, ChatTypeEnum type, string message, ChatSourceType src) { if (!presence.IsChildAgent) @@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat LLVector3 fromRegionPos = fromPos + regionPos; LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); - + if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || type == ChatTypeEnum.Say && dis > m_saydistance || type == ChatTypeEnum.Shout && dis > m_shoutdistance) @@ -197,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat } // TODO: should change so the message is sent through the avatar rather than direct to the ClientView - presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, + presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); } } diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index 03f9a880be..283551bf23 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat { public class IRCBridgeModule : IRegionModule, ISimChat { - private static readonly ILog m_log = + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private const int DEBUG_CHANNEL = 2147483647; @@ -94,7 +94,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat m_irc_connector.Name = "IRCConnectorThread"; m_irc_connector.IsBackground = true; } - m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, + m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, m_defaultzone); } } @@ -222,7 +222,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if ((m_irc.Enabled) && (m_irc.Connected)) { m_log.DebugFormat("[IRC] {0} logging on", clientName); - m_irc.PrivMsg(m_irc.Nick, "Sim", + m_irc.PrivMsg(m_irc.Nick, "Sim", String.Format("notices {0} logging on", clientName)); } m_last_new_user = clientName; @@ -288,7 +288,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat m_log.InfoFormat("[IRC]: {0} logging out", clientName); } - if (m_last_new_user == clientName) + if (m_last_new_user == clientName) m_last_new_user = null; } } @@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (!avatar.IsChildAgent) { avatar.ControllingClient.SendChatMessage( - Helpers.StringToField(data["msg"]), + Helpers.StringToField(data["msg"]), 1, // 255, pos, data["nick"], LLUUID.Zero,(byte)ChatSourceType.Agent,(byte)ChatAudibleLevel.Fully); @@ -634,9 +634,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (!avatar.IsChildAgent) { avatar.ControllingClient.SendChatMessage( - Helpers.StringToField(String.Format(format, args)), - 1, //255, - pos, sender, LLUUID.Zero, + Helpers.StringToField(String.Format(format, args)), + 1, //255, + pos, sender, LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); } diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 2e8a8dace3..80936f6784 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs @@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice string capsBase = "/CAPS/" + caps.CapsObjectPath; caps.RegisterHandler("ParcelVoiceInfoRequest", new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ParcelVoiceInfoRequest(request, path, param, @@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice })); caps.RegisterHandler("ProvisionVoiceAccountRequest", new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ProvisionVoiceAccountRequest(request, path, param, diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index 77f761f280..865894e5cc 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice string capsBase = "/CAPS/" + caps.CapsObjectPath; caps.RegisterHandler("ParcelVoiceInfoRequest", new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ParcelVoiceInfoRequest(request, path, param, @@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice })); caps.RegisterHandler("ProvisionVoiceAccountRequest", new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath, - delegate(string request, string path, string param, + delegate(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) { return ProvisionVoiceAccountRequest(request, path, param, diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index 27f16a7da7..7016d1b160 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// This module loads and saves OpenSimulator archives /// public class ArchiverModule : IRegionModule, IRegionArchiver - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// @@ -47,51 +47,51 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// /// /// - private Scene m_scene; - + private Scene m_scene; + public string Name { get { return "ArchiverModule"; } } - + public bool IsSharedModule { get { return false; } } - + public void Initialise(Scene scene, IConfigSource source) { m_scene = scene; - + m_scene.RegisterModuleInterface(this); } - + public void PostInitialise() - { + { } - + public void Close() { } - + public void ArchiveRegion(string savePath) { m_log.Warn("[ARCHIVER]: Archive region not yet implemented"); - + List entities = m_scene.GetEntities(); - + foreach (EntityBase entity in entities) { - + } - - string serEntities = SerializeObjects(entities); - + + string serEntities = SerializeObjects(entities); + if (serEntities != null && serEntities.Length > 0) { m_log.DebugFormat("[ARCHIVER]: Successfully got serialization for {0} entities", entities.Count); } } - + public void DearchiveRegion(string loadPath) { m_log.Warn("[ARCHIVER]: Dearchive region not yet implemented"); } - + /// /// Get an xml representation of the given scene objects. /// @@ -115,8 +115,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver serialization += serObject; serialization += ""; - + return serialization; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs index 485cf02b20..b9496665f0 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/IRegionArchiver.cs @@ -28,7 +28,7 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.World.Archiver -{ +{ /// /// Interface to region archive functionality /// @@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver /// /// void ArchiveRegion(string savePath); - + /// /// Dearchive the given region archive into the scene /// diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 2f4f971958..f5b1a1d635 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs @@ -731,7 +731,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land if (obj.OwnerID == owners[i]) objlist.Add(obj); } - } + } catch (InvalidOperationException) { m_log.Info("[PARCEL]: Unable to figure out all the objects owned by " + owners[i].ToString() + " arr."); @@ -751,7 +751,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land landData.ownerPrims = 0; landData.otherPrims = 0; landData.selectedPrims = 0; - + lock (primsOverMe) primsOverMe.Clear(); @@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land public void addPrimToCount(SceneObjectGroup obj) { - + LLUUID prim_owner = obj.OwnerID; int prim_count = obj.PrimCount; diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index d6e905b8c3..0405bdfa46 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -1448,12 +1448,12 @@ namespace OpenSim.Region.Environment.Scenes Entities.Add(copy.UUID, copy); } - // Since we copy from a source group that is in selected - // state, but the copy is shown deselected in the viewer, - // We need to clear the selection flag here, else that - // prim never gets persisted at all. The client doesn't - // think it's selected, so it will never send a deselect... - copy.IsSelected=false; + // Since we copy from a source group that is in selected + // state, but the copy is shown deselected in the viewer, + // We need to clear the selection flag here, else that + // prim never gets persisted at all. The client doesn't + // think it's selected, so it will never send a deselect... + copy.IsSelected = false; m_numPrim++; diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 4d19d720f8..f27d0ab234 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1078,7 +1078,7 @@ namespace OpenSim.Region.Environment.Scenes } } - + /// /// Called when an object is removed from the environment into inventory. /// @@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Environment.Scenes public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) { DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; - + LLUUID folderID = LLUUID.Zero; foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) @@ -1128,7 +1128,7 @@ namespace OpenSim.Region.Environment.Scenes else if (DeRezPacket.AgentBlock.Destination == 6) //Delete { - permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); + permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); } else if (DeRezPacket.AgentBlock.Destination == 9) //Return @@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Environment.Scenes DeleteSceneObject(objectGroup); } } - } + } } public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID) @@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes } group.ResetIDs(); - + AddSceneObject(group); // if attachment we set it's asset id so object updates can reflect that @@ -1583,7 +1583,7 @@ namespace OpenSim.Region.Environment.Scenes } } } - + return null; } @@ -1606,7 +1606,7 @@ namespace OpenSim.Region.Environment.Scenes return null; } group.ResetIDs(); - + AddSceneObject(group); // Set the startup parameter for on_rez event and llGetStartParameter() function @@ -1674,7 +1674,7 @@ namespace OpenSim.Region.Environment.Scenes if (returnobjects.Length <= 0) return false; - // for the moment we're going to store them individually.. however, in the future, the rezObject + // for the moment we're going to store them individually.. however, in the future, the rezObject // will be able to have more items. //string returnstring = ""; @@ -1684,9 +1684,9 @@ namespace OpenSim.Region.Environment.Scenes // returnstring += grp.ToXmlString2(); //} //returnstring += "\n"; - - + + bool permissionToDelete = false; @@ -1697,7 +1697,7 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo == null) { CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID); - + } if (userInfo != null) { @@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes returningavatar.ControllingClient.SendAlertMessage(message); } return false; - } + } return true; } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1e88018582..27431ed0c2 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes private int m_incrementsof15seconds = 0; private volatile bool m_backingup = false; - protected string m_simulatorVersion = "unknown"; + protected string m_simulatorVersion = "unknown"; protected ModuleLoader m_moduleLoader; protected StorageManager m_storageManager; @@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Scenes public Scene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, - ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, + ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) { m_config = config; @@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes m_statsReporter.SetObjectCapacity(objectCapacity); m_simulatorVersion = simulatorVersion - + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); } @@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// Add an object into the scene that has come from storage /// - /// + /// public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject) { m_innerScene.AddSceneObjectFromStorage(sceneObject); @@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Environment.Scenes public void AddSceneObject(SceneObjectGroup sceneObject) { m_innerScene.AddSceneObject(sceneObject); - } + } /// /// Delete this object from the scene. @@ -1344,20 +1344,20 @@ namespace OpenSim.Region.Environment.Scenes public void DeleteSceneObject(SceneObjectGroup group) { SceneObjectPart rootPart = (group).GetChildPart(group.UUID); - + if (rootPart.PhysActor != null) { PhysicsScene.RemovePrim(rootPart.PhysActor); rootPart.PhysActor = null; - } + } if (UnlinkSceneObject(group.UUID)) { EventManager.TriggerObjectBeingRemovedFromScene(group); EventManager.TriggerParcelPrimCountTainted(); - } + } - group.DeleteGroup(); + group.DeleteGroup(); group.DeleteParts(); // In case anybody else retains a reference to this group, signal deletion by changing the name @@ -1367,8 +1367,8 @@ namespace OpenSim.Region.Environment.Scenes // conditions where a user deletes an entity while it is being stored. Really, the update // code needs a redesign. group.Name = null; - } - + } + /// /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the /// object itself is not destroyed. @@ -1376,14 +1376,14 @@ namespace OpenSim.Region.Environment.Scenes /// /// true if the object was in the scene, false if it was not public bool UnlinkSceneObject(LLUUID uuid) - { + { if (m_innerScene.DeleteSceneObject(uuid)) { m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID); - + return true; } - + return false; } @@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Environment.Scenes { m_sceneXmlLoader.SavePrimsToXml2(fileName); } - + /// /// Load a prim archive into the scene. This loads both prims and their assets. /// @@ -1416,7 +1416,7 @@ namespace OpenSim.Region.Environment.Scenes IRegionArchiver archiver = RequestModuleInterface(); archiver.DearchiveRegion(filePath); } - + /// /// Save the prims in the scene to an archive. This saves both prims and their assets. /// @@ -1825,7 +1825,7 @@ namespace OpenSim.Region.Environment.Scenes protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) { - + AvatarAppearance appearance = null; GetAvatarAppearance(client, out appearance); diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index eae041b934..66174bfa05 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes { CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); } - + /// /// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format /// @@ -188,12 +188,12 @@ namespace OpenSim.Region.Environment.Scenes /// /// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene - /// + /// public void LoadCurrentSceneFromXml2(string filename) { CurrentOrFirstScene.LoadPrimsFromXml2(filename); } - + /// /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets /// as well as the details of the prims themselves. @@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Scenes { CurrentOrFirstScene.SavePrimsToArchive(filename); } - + /// /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload /// their assets to the asset service. diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index cd4be99b76..2ad01f92a2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -271,11 +271,11 @@ namespace OpenSim.Region.Environment.Scenes get { return m_rootPart.Text; } set { m_rootPart.Text = value; } } - + protected virtual bool InSceneBackup { get { return true; } - } + } public bool IsSelected { @@ -523,11 +523,11 @@ namespace OpenSim.Region.Environment.Scenes { // m_log.DebugFormat( // "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID); - + m_scene.EventManager.OnBackup += ProcessBackup; } } - + public LLVector3 GroupScale() { LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize); @@ -1079,21 +1079,21 @@ namespace OpenSim.Region.Environment.Scenes /// /// public void ProcessBackup(IRegionDataStore datastore) - { + { // don't backup while it's selected or you're asking for changes mid stream. if (HasGroupChanged) { if ((!IsSelected) && (RootPart != null)) { m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); - + SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); - + datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); HasGroupChanged = false; backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); - + backup_group = null; } // else @@ -1102,10 +1102,10 @@ namespace OpenSim.Region.Environment.Scenes // "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID); // } } - + // Why is storing the inventory outside of HasGroupChanged? - + //ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); } @@ -1192,7 +1192,7 @@ namespace OpenSim.Region.Environment.Scenes dupe.m_regionHandle = m_regionHandle; dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); - + if (userExposed) dupe.m_rootPart.TrimPermissions(); @@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes { SetRootPartOwner(m_rootPart, cAgentID, cGroupID); m_rootPart.ScheduleFullUpdate(); - } + } List partList = new List(m_parts.Values); foreach (SceneObjectPart part in partList) @@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes if (part.UUID != m_rootPart.UUID) { dupe.CopyPart(part, OwnerID, GroupID, userExposed); - + if (userExposed) { SetPartOwner(part, cAgentID, cGroupID); diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 21e650f51f..19debeae46 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -1403,10 +1403,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar) { - if(remoteAvatar == null) - return; - IClientAPI rc=remoteAvatar.ControllingClient; - if(rc == null) + if (remoteAvatar == null || remoteAvatar.ControllingClient == null) return; remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index e66113d774..6d88061c96 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs @@ -51,10 +51,10 @@ namespace OpenSim.Region.Modules.AvatarFactory public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) { CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); - if ((profile != null) && (profile.RootFolder != null)) + if ((profile != null) && (profile.RootFolder != null)) { appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); - if (appearance != null) + if (appearance != null) { SetAppearanceAssets(profile, ref appearance); m_log.InfoFormat("[APPEARANCE] found : {0}", appearance.ToString()); @@ -182,9 +182,9 @@ namespace OpenSim.Region.Modules.AvatarFactory } } SetAppearanceAssets(profile, ref avatAppearance); - + m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance); - avatar.Appearance = avatAppearance; + avatar.Appearance = avatAppearance; } else { @@ -200,7 +200,7 @@ namespace OpenSim.Region.Modules.AvatarFactory } public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) - { + { m_scene.CommsManager.UserService.UpdateUserAppearance(user, appearance); } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index fbfb400c83..9446844b85 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -3298,8 +3298,11 @@ namespace OpenSim.Region.ScriptEngine.Common result.Add(src.Substring(start,length).Trim()); start += length+1; length = 0; - } else + } + else + { length++; + } break; default : length++; @@ -5301,7 +5304,8 @@ namespace OpenSim.Region.ScriptEngine.Common { // not present at all active[j] = false; - } else + } + else { // present and correct if (offset[j] < offset[best]) @@ -5329,10 +5333,11 @@ namespace OpenSim.Region.ScriptEngine.Common tokens.Add(src.Substring(beginning,offset[best]-beginning)); - if (best