diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index bc706f055d..42266ce036 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs @@ -65,9 +65,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) { - Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); + Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); - Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); + Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); } // Register interface using the absolute URI. @@ -282,7 +282,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory Rest.Log.WarnFormat("{0} Method {1} not supported for {2}", MsgId, rdata.method, rdata.path); rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, - String.Format("{0} not supported", rdata.method)); + String.Format("{0} not supported", rdata.method)); break; } } @@ -669,7 +669,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory case "VisualParameters" : { xml.ReadContentAsBase64(rdata.userAppearance.VisualParams, - 0,rdata.userAppearance.VisualParams.Length); + 0, rdata.userAppearance.VisualParams.Length); indata = true; } break; diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index 5fd8015570..b67922fb3b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs @@ -57,9 +57,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) { - Rest.Log.InfoFormat("{0} Prefixing domain name ({1})", MsgId, qPrefix); + Rest.Log.InfoFormat("{0} Prefixing domain name ({1})", MsgId, qPrefix); qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); - Rest.Log.InfoFormat("{0} Fully qualified domain name is <{1}>", MsgId, qPrefix); + Rest.Log.InfoFormat("{0} Fully qualified domain name is <{1}>", MsgId, qPrefix); } // Register interface using the fully-qualified prefix diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 126b757c9b..fd4c2954b6 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs @@ -264,8 +264,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (Rest.Prefix.Substring(0,1) != Rest.UrlPathSeparator) { - Rest.Log.WarnFormat("{0} Prefix <{1}> is not absolute and must be", MsgId, Rest.Prefix); - Rest.Log.InfoFormat("{0} Prefix changed to ", MsgId, Rest.Prefix); + Rest.Log.WarnFormat("{0} Prefix <{1}> is not absolute and must be", MsgId, Rest.Prefix); + Rest.Log.InfoFormat("{0} Prefix changed to ", MsgId, Rest.Prefix); Rest.Prefix = String.Format("{0}{1}", Rest.UrlPathSeparator, Rest.Prefix); } diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 6791cba8fb..0aad058af4 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs @@ -66,9 +66,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) { - Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); + Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); - Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); + Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); } // Register interface using the absolute URI. @@ -331,9 +331,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory default : Rest.Log.WarnFormat("{0} Method {1} not supported for {2}", - MsgId, rdata.method, rdata.path); + MsgId, rdata.method, rdata.path); rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, - String.Format("{0} not supported", rdata.method)); + String.Format("{0} not supported", rdata.method)); break; } } diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs index 8d28dd6dfa..b24b5ede78 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs @@ -58,9 +58,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) { - Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); + Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); - Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); + Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); } // Load test cases diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 3295a96028..b77676c333 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2728,7 +2728,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api client.OnScriptAnswer-=handleScriptAnswer; m_waitingForScriptAnswer=false; - if((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) + if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) llReleaseControls(); m_host.TaskInventory[invItemID].PermsMask=answer; @@ -2815,7 +2815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // byte uf = childPrim.RootPart.UpdateFlag; childPrim.RootPart.UpdateFlag = 0; parentPrim.LinkToGroup(childPrim); -// if(uf != (Byte)0) +// if (uf != (Byte)0) // parent.RootPart.UpdateFlag = uf; } parentPrim.TriggerScriptChangedEvent(Changed.LINK); @@ -3742,7 +3742,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { face = 0; } - if(face >= 0 && face < GetNumberOfSides(part)) + if (face >= 0 && face < GetNumberOfSides(part)) { offset.x = tex.GetFace((uint)face).OffsetU; offset.y = tex.GetFace((uint)face).OffsetV;