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

Update svn properties, formatting cleanup.

0.6.0-stable
Jeff Ames 2008-09-23 23:14:00 +00:00
parent 1aab81e235
commit 3f79e6b3e7
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,8 +397,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (rdata.userAppearance != null) if (rdata.userAppearance != null)
{ {
modified = true; modified = true;
Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance); Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance);
} }
if (created) if (created)

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

@ -248,8 +248,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
private void DoPut(AssetRequestData rdata) private void DoPut(AssetRequestData rdata)
{ {
bool modified = false; bool modified = false;
bool created = false; bool created = false;
Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
@ -269,7 +269,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); AssetBase asset = Rest.AssetServices.GetAsset(uuid, false);
modified = (asset != null); modified = (asset != null);
created = !modified; created = !modified;
asset = new AssetBase(); asset = new AssetBase();
asset.FullID = uuid; asset.FullID = uuid;
@ -283,7 +283,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (asset.ID != rdata.Parameters[0]) if (asset.ID != rdata.Parameters[0])
{ {
Rest.Log.WarnFormat("{0} URI and payload disagree on UUID U:{1} vs P:{2}", Rest.Log.WarnFormat("{0} URI and payload disagree on UUID U:{1} vs P:{2}",
MsgId, rdata.Parameters[0], asset.ID); MsgId, rdata.Parameters[0], asset.ID);
} }
Rest.AssetServices.AddAsset(asset); Rest.AssetServices.AddAsset(asset);
@ -323,8 +323,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
private void DoPost(AssetRequestData rdata) private void DoPost(AssetRequestData rdata)
{ {
bool modified = false; bool modified = false;
bool created = false; bool created = false;
Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
@ -347,7 +347,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); AssetBase asset = Rest.AssetServices.GetAsset(uuid, false);
modified = (asset != null); modified = (asset != null);
created = !modified; created = !modified;
asset = new AssetBase(); asset = new AssetBase();
asset.FullID = uuid; asset.FullID = uuid;

2
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -5286,7 +5286,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
break; break;
case PacketType.RezScript: case PacketType.RezScript:
m_log.DebugFormat("[AMW] RezScript"); m_log.DebugFormat("[AMW] RezScript");
//Console.WriteLine(Pack.ToString()); //Console.WriteLine(Pack.ToString());
RezScriptPacket rezScriptx = (RezScriptPacket)Pack; RezScriptPacket rezScriptx = (RezScriptPacket)Pack;

2
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
// TODO: add group support! // TODO: add group support!
// //
if(part.OwnerID != editorID) if (part.OwnerID != editorID)
return false; return false;
return GenericObjectPermission(editorID, objectID, false); return GenericObjectPermission(editorID, objectID, false);

14
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1201,9 +1201,9 @@ namespace OpenSim.Region.Environment.Scenes
if (part != null) if (part != null)
{ {
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId))
{ {
return; return;
} }
TaskInventoryItem currentItem = part.GetInventoryItem(itemID); TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
@ -1296,10 +1296,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
SceneObjectPart part = GetSceneObjectPart(localID); SceneObjectPart part = GetSceneObjectPart(localID);
if (part != null) if (part != null)
{ {
if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId))
{ {
return; return;
} }
part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
// TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs
View File

@ -730,11 +730,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
c.Value = c.Value.Insert(dotIndex, "0"); c.Value = c.Value.Insert(dotIndex, "0");
c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; c.Value = "new LSL_Types.LSLFloat("+c.Value+")";
} }
else if("LSL_Types.LSLInteger" == c.Type) else if ("LSL_Types.LSLInteger" == c.Type)
{ {
c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; c.Value = "new LSL_Types.LSLInteger("+c.Value+")";
} }
else if("LSL_Types.LSLString" == c.Type) else if ("LSL_Types.LSLString" == c.Type)
{ {
c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")";
} }

4
OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
View File

@ -730,11 +730,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
c.Value = c.Value.Insert(dotIndex, "0"); c.Value = c.Value.Insert(dotIndex, "0");
c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; c.Value = "new LSL_Types.LSLFloat("+c.Value+")";
} }
else if("LSL_Types.LSLInteger" == c.Type) else if ("LSL_Types.LSLInteger" == c.Type)
{ {
c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; c.Value = "new LSL_Types.LSLInteger("+c.Value+")";
} }
else if("LSL_Types.LSLString" == c.Type) else if ("LSL_Types.LSLString" == c.Type)
{ {
c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")";
} }