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

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-09-18 16:07:06 +00:00
parent e3a3ce7628
commit ac083becd9
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@ -65,9 +65,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 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); 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. // 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}", Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
MsgId, rdata.method, rdata.path); MsgId, rdata.method, rdata.path);
rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed,
String.Format("{0} not supported", rdata.method)); String.Format("{0} not supported", rdata.method));
break; break;
} }
} }
@ -669,7 +669,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
case "VisualParameters" : case "VisualParameters" :
{ {
xml.ReadContentAsBase64(rdata.userAppearance.VisualParams, xml.ReadContentAsBase64(rdata.userAppearance.VisualParams,
0,rdata.userAppearance.VisualParams.Length); 0, rdata.userAppearance.VisualParams.Length);
indata = true; indata = true;
} }
break; break;

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
View File

@ -57,9 +57,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 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); 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 // Register interface using the fully-qualified prefix

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
View File

@ -264,8 +264,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (Rest.Prefix.Substring(0,1) != Rest.UrlPathSeparator) 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.WarnFormat("{0} Prefix <{1}> is not absolute and must be", MsgId, Rest.Prefix);
Rest.Log.InfoFormat("{0} Prefix changed to </{1}>", MsgId, Rest.Prefix); Rest.Log.InfoFormat("{0} Prefix changed to </{1}>", MsgId, Rest.Prefix);
Rest.Prefix = String.Format("{0}{1}", Rest.UrlPathSeparator, Rest.Prefix); Rest.Prefix = String.Format("{0}{1}", Rest.UrlPathSeparator, Rest.Prefix);
} }

8
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

@ -66,9 +66,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 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); 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. // Register interface using the absolute URI.
@ -331,9 +331,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
default : default :
Rest.Log.WarnFormat("{0} Method {1} not supported for {2}", Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
MsgId, rdata.method, rdata.path); MsgId, rdata.method, rdata.path);
rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed,
String.Format("{0} not supported", rdata.method)); String.Format("{0} not supported", rdata.method));
break; break;
} }
} }

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
View File

@ -58,9 +58,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 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); 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 // Load test cases

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2728,7 +2728,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
client.OnScriptAnswer-=handleScriptAnswer; client.OnScriptAnswer-=handleScriptAnswer;
m_waitingForScriptAnswer=false; m_waitingForScriptAnswer=false;
if((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
llReleaseControls(); llReleaseControls();
m_host.TaskInventory[invItemID].PermsMask=answer; m_host.TaskInventory[invItemID].PermsMask=answer;
@ -2815,7 +2815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// byte uf = childPrim.RootPart.UpdateFlag; // byte uf = childPrim.RootPart.UpdateFlag;
childPrim.RootPart.UpdateFlag = 0; childPrim.RootPart.UpdateFlag = 0;
parentPrim.LinkToGroup(childPrim); parentPrim.LinkToGroup(childPrim);
// if(uf != (Byte)0) // if (uf != (Byte)0)
// parent.RootPart.UpdateFlag = uf; // parent.RootPart.UpdateFlag = uf;
} }
parentPrim.TriggerScriptChangedEvent(Changed.LINK); parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@ -3742,7 +3742,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
face = 0; face = 0;
} }
if(face >= 0 && face < GetNumberOfSides(part)) if (face >= 0 && face < GetNumberOfSides(part))
{ {
offset.x = tex.GetFace((uint)face).OffsetU; offset.x = tex.GetFace((uint)face).OffsetU;
offset.y = tex.GetFace((uint)face).OffsetV; offset.y = tex.GetFace((uint)face).OffsetV;