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

Copyright notices and formatting cleanup.

0.6.0-stable
Jeff Ames 2008-07-06 14:02:22 +00:00
parent 34cac351cb
commit d470d30c09
22 changed files with 991 additions and 887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
View File

@ -476,7 +476,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
}
else
{
lock(cntable) cntable.Add(cnonce, nck);
lock (cntable) cntable.Add(cnonce, nck);
}
}

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

@ -108,7 +108,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
/// </summary>
private void LoadHandlers()
{
lock(handlers)
lock (handlers)
{
if (!handlersLoaded)
{

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

@ -238,7 +238,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}",
MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
lock(rdata)
lock (rdata)
{
if (!rdata.HaveInventory)
{
@ -1869,7 +1869,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
this.folders = folders;
this.items = items;
this.HaveInventory = true;
lock(this)
lock (this)
{
Monitor.Pulse(this);
}

4
OpenSim/Data/MySQL/MySQLDataStore.cs
View File

@ -729,13 +729,13 @@ namespace OpenSim.Data.MySQL
public RegionSettings LoadRegionSettings(LLUUID regionUUID)
{
lock(m_dataSet)
lock (m_dataSet)
{
CheckConnection();
DataTable regionsettings = m_regionSettingsTable;
string searchExp = "regionUUID = '" + regionUUID.ToString() + "'";
DataRow[] rawsettings = regionsettings.Select(searchExp);
if(rawsettings.Length == 0)
if (rawsettings.Length == 0)
{
RegionSettings rs = new RegionSettings();
rs.RegionUUID = regionUUID;

29
OpenSim/Framework/Communications/IAvatarService.cs
View File

@ -1,4 +1,31 @@
using System;
/*
* 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.Collections.Generic;
using System.Text;
using libsecondlife;

2
OpenSim/Framework/RegionInfo.cs
View File

@ -285,7 +285,7 @@ namespace OpenSim.Framework
{
get
{
if(m_regionSettings == null)
if (m_regionSettings == null)
{
m_regionSettings = new RegionSettings();
}

336
OpenSim/Framework/RegionSettings.cs
View File

@ -135,7 +135,7 @@ namespace OpenSim.Framework
public bool HandleIncomingConfiguration(string key, object value)
{
switch(key)
switch (key)
{
case "region_flags":
Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value;
@ -171,7 +171,7 @@ namespace OpenSim.Framework
break;
case "sim_access":
int access = (int)value;
if(access <= 13)
if (access <= 13)
m_Maturity = 0;
else
m_Maturity = 1;
@ -236,266 +236,266 @@ namespace OpenSim.Framework
private LLUUID m_RegionUUID = LLUUID.Zero;
public LLUUID RegionUUID
{
get { return m_RegionUUID; }
set { m_RegionUUID = value; }
}
public LLUUID RegionUUID
{
get { return m_RegionUUID; }
set { m_RegionUUID = value; }
}
private bool m_BlockTerraform = false;
public bool BlockTerraform
{
get { return m_BlockTerraform; }
set { m_BlockTerraform = value; }
}
public bool BlockTerraform
{
get { return m_BlockTerraform; }
set { m_BlockTerraform = value; }
}
private bool m_BlockFly = false;
public bool BlockFly
{
get { return m_BlockFly; }
set { m_BlockFly = value; }
}
public bool BlockFly
{
get { return m_BlockFly; }
set { m_BlockFly = value; }
}
private bool m_AllowDamage = false;
public bool AllowDamage
{
get { return m_AllowDamage; }
set { m_AllowDamage = value; }
}
public bool AllowDamage
{
get { return m_AllowDamage; }
set { m_AllowDamage = value; }
}
private bool m_RestrictPushing = false;
public bool RestrictPushing
{
get { return m_RestrictPushing; }
set { m_RestrictPushing = value; }
}
public bool RestrictPushing
{
get { return m_RestrictPushing; }
set { m_RestrictPushing = value; }
}
private bool m_AllowLandResell = true;
public bool AllowLandResell
{
get { return m_AllowLandResell; }
set { m_AllowLandResell = value; }
}
public bool AllowLandResell
{
get { return m_AllowLandResell; }
set { m_AllowLandResell = value; }
}
private bool m_AllowLandJoinDivide = true;
public bool AllowLandJoinDivide
{
get { return m_AllowLandJoinDivide; }
set { m_AllowLandJoinDivide = value; }
}
public bool AllowLandJoinDivide
{
get { return m_AllowLandJoinDivide; }
set { m_AllowLandJoinDivide = value; }
}
private bool m_BlockShowInSearch = false;
public bool BlockShowInSearch
{
get { return m_BlockShowInSearch; }
set { m_BlockShowInSearch = value; }
}
public bool BlockShowInSearch
{
get { return m_BlockShowInSearch; }
set { m_BlockShowInSearch = value; }
}
private int m_AgentLimit = 40;
public int AgentLimit
{
get { return m_AgentLimit; }
set { m_AgentLimit = value; }
}
public int AgentLimit
{
get { return m_AgentLimit; }
set { m_AgentLimit = value; }
}
private double m_ObjectBonus = 1.0;
public double ObjectBonus
{
get { return m_ObjectBonus; }
set { m_ObjectBonus = value; }
}
public double ObjectBonus
{
get { return m_ObjectBonus; }
set { m_ObjectBonus = value; }
}
private int m_Maturity = 1;
public int Maturity
{
get { return m_Maturity; }
set { m_Maturity = value; }
}
public int Maturity
{
get { return m_Maturity; }
set { m_Maturity = value; }
}
private bool m_DisableScripts = false;
public bool DisableScripts
{
get { return m_DisableScripts; }
set { m_DisableScripts = value; }
}
public bool DisableScripts
{
get { return m_DisableScripts; }
set { m_DisableScripts = value; }
}
private bool m_DisableCollisions = false;
public bool DisableCollisions
{
get { return m_DisableCollisions; }
set { m_DisableCollisions = value; }
}
public bool DisableCollisions
{
get { return m_DisableCollisions; }
set { m_DisableCollisions = value; }
}
private bool m_DisablePhysics = false;
public bool DisablePhysics
{
get { return m_DisablePhysics; }
set { m_DisablePhysics = value; }
}
public bool DisablePhysics
{
get { return m_DisablePhysics; }
set { m_DisablePhysics = value; }
}
private LLUUID m_TerrainTexture1 = LLUUID.Zero;
public LLUUID TerrainTexture1
{
get { return m_TerrainTexture1; }
set { m_TerrainTexture1 = value; }
}
public LLUUID TerrainTexture1
{
get { return m_TerrainTexture1; }
set { m_TerrainTexture1 = value; }
}
private LLUUID m_TerrainTexture2 = LLUUID.Zero;
public LLUUID TerrainTexture2
{
get { return m_TerrainTexture2; }
set { m_TerrainTexture2 = value; }
}
public LLUUID TerrainTexture2
{
get { return m_TerrainTexture2; }
set { m_TerrainTexture2 = value; }
}
private LLUUID m_TerrainTexture3 = LLUUID.Zero;
public LLUUID TerrainTexture3
{
get { return m_TerrainTexture3; }
set { m_TerrainTexture3 = value; }
}
public LLUUID TerrainTexture3
{
get { return m_TerrainTexture3; }
set { m_TerrainTexture3 = value; }
}
private LLUUID m_TerrainTexture4 = LLUUID.Zero;
public LLUUID TerrainTexture4
{
get { return m_TerrainTexture4; }
set { m_TerrainTexture4 = value; }
}
public LLUUID TerrainTexture4
{
get { return m_TerrainTexture4; }
set { m_TerrainTexture4 = value; }
}
private double m_Elevation1NW = 10;
public double Elevation1NW
{
get { return m_Elevation1NW; }
set { m_Elevation1NW = value; }
}
public double Elevation1NW
{
get { return m_Elevation1NW; }
set { m_Elevation1NW = value; }
}
private double m_Elevation2NW = 60;
public double Elevation2NW
{
get { return m_Elevation2NW; }
set { m_Elevation2NW = value; }
}
public double Elevation2NW
{
get { return m_Elevation2NW; }
set { m_Elevation2NW = value; }
}
private double m_Elevation1NE = 10;
public double Elevation1NE
{
get { return m_Elevation1NE; }
set { m_Elevation1NE = value; }
}
public double Elevation1NE
{
get { return m_Elevation1NE; }
set { m_Elevation1NE = value; }
}
private double m_Elevation2NE = 60;
public double Elevation2NE
{
get { return m_Elevation2NE; }
set { m_Elevation2NE = value; }
}
public double Elevation2NE
{
get { return m_Elevation2NE; }
set { m_Elevation2NE = value; }
}
private double m_Elevation1SE = 10;
public double Elevation1SE
{
get { return m_Elevation1SE; }
set { m_Elevation1SE = value; }
}
public double Elevation1SE
{
get { return m_Elevation1SE; }
set { m_Elevation1SE = value; }
}
private double m_Elevation2SE = 60;
public double Elevation2SE
{
get { return m_Elevation2SE; }
set { m_Elevation2SE = value; }
}
public double Elevation2SE
{
get { return m_Elevation2SE; }
set { m_Elevation2SE = value; }
}
private double m_Elevation1SW = 10;
public double Elevation1SW
{
get { return m_Elevation1SW; }
set { m_Elevation1SW = value; }
}
public double Elevation1SW
{
get { return m_Elevation1SW; }
set { m_Elevation1SW = value; }
}
private double m_Elevation2SW = 60;
public double Elevation2SW
{
get { return m_Elevation2SW; }
set { m_Elevation2SW = value; }
}
public double Elevation2SW
{
get { return m_Elevation2SW; }
set { m_Elevation2SW = value; }
}
private double m_WaterHeight = 20;
public double WaterHeight
{
get { return m_WaterHeight; }
set { m_WaterHeight = value; }
}
public double WaterHeight
{
get { return m_WaterHeight; }
set { m_WaterHeight = value; }
}
private double m_TerrainRaiseLimit = 100;
public double TerrainRaiseLimit
{
get { return m_TerrainRaiseLimit; }
set { m_TerrainRaiseLimit = value; }
}
public double TerrainRaiseLimit
{
get { return m_TerrainRaiseLimit; }
set { m_TerrainRaiseLimit = value; }
}
private double m_TerrainLowerLimit = 100;
public double TerrainLowerLimit
{
get { return m_TerrainLowerLimit; }
set { m_TerrainLowerLimit = value; }
}
public double TerrainLowerLimit
{
get { return m_TerrainLowerLimit; }
set { m_TerrainLowerLimit = value; }
}
private bool m_UseEstateSun = true;
public bool UseEstateSun
{
get { return m_UseEstateSun; }
set { m_UseEstateSun = value; }
}
public bool UseEstateSun
{
get { return m_UseEstateSun; }
set { m_UseEstateSun = value; }
}
private bool m_FixedSun = false;
public bool FixedSun
{
get { return m_FixedSun; }
set { m_FixedSun = value; }
}
public bool FixedSun
{
get { return m_FixedSun; }
set { m_FixedSun = value; }
}
private double m_SunPosition = 0.0;
public double SunPosition
{
get { return m_SunPosition; }
set { m_SunPosition = value; }
}
public double SunPosition
{
get { return m_SunPosition; }
set { m_SunPosition = value; }
}
private LLUUID m_Covenant = LLUUID.Zero;
public LLUUID Covenant
{
get { return m_Covenant; }
set { m_Covenant = value; }
}
}
public LLUUID Covenant
{
get { return m_Covenant; }
set { m_Covenant = value; }
}
}
}

2
OpenSim/Framework/Servers/OSHttpRequestPump.cs
View File

@ -116,7 +116,7 @@ namespace OpenSim.Framework.Servers
// we are either out of handlers or get back a
// Handled or Detached
OSHttpHandlerResult rc = OSHttpHandlerResult.Unprocessed;
foreach(OSHttpHandler h in handlers)
foreach (OSHttpHandler h in handlers)
{
rc = h.Process(req);

20
OpenSim/Region/Environment/Interfaces/IEmailModule.cs
View File

@ -31,18 +31,18 @@ using libsecondlife;
namespace OpenSim.Region.Environment.Interfaces
{
public class Email
{
public string time;
public string sender;
public string subject;
public string message;
public int numLeft;
}
public class Email
{
public string time;
public string sender;
public string subject;
public string message;
public int numLeft;
}
public interface IEmailModule : IRegionModule
{
void SendEmail(LLUUID objectID, string address, string subject, string body);
Email GetNextEmail(LLUUID objectID, string sender, string subject);
void SendEmail(LLUUID objectID, string address, string subject, string body);
Email GetNextEmail(LLUUID objectID, string sender, string subject);
}
}

2
OpenSim/Region/Environment/Interfaces/IScriptModule.cs
View File

@ -33,6 +33,6 @@ namespace OpenSim.Region.Environment.Interfaces
{
public interface IScriptModule : IRegionModule
{
bool GetScriptRunning(LLUUID objectID, LLUUID itemID);
bool GetScriptRunning(LLUUID objectID, LLUUID itemID);
}
}

49
OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
View File

@ -1,3 +1,30 @@
/*
* 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.Reflection;
using System.Collections.Generic;
@ -24,9 +51,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
// Scenes by Region Handle
private Dictionary<ulong, Scene> m_Scenes =
new Dictionary<ulong, Scene>();
new Dictionary<ulong, Scene>();
private bool m_Enabled = false;
private bool m_Enabled = false;
public void Initialise(Scene scene, IConfigSource config)
{
@ -34,8 +61,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
IConfig startupConfig = m_Config.Configs["Startup"];
m_Enabled = (startupConfig.GetString("emailmodule",
"DefaultEmailModule") == "DefaultEmailModule");
m_Enabled = (startupConfig.GetString("emailmodule",
"DefaultEmailModule") == "DefaultEmailModule");
// It's a go!
if (m_Enabled)
@ -79,12 +106,12 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
}
public void SendEmail(LLUUID objectID, string address, string subject, string body)
{
}
{
}
public Email GetNextEmail(LLUUID objectID, string sender, string subject)
{
return null;
}
}
public Email GetNextEmail(LLUUID objectID, string sender, string subject)
{
return null;
}
}
}

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

@ -995,7 +995,7 @@ namespace OpenSim.Region.Environment.Scenes
else
{
CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(avatarId);
if(profile == null || profile.RootFolder == null)
if (profile == null || profile.RootFolder == null)
{
m_log.ErrorFormat(
"[PRIM INVENTORY]: " +
@ -1040,7 +1040,7 @@ namespace OpenSim.Region.Environment.Scenes
return;
}
if(part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.AllowInventoryDrop) == 0)
if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.AllowInventoryDrop) == 0)
{
// object cannot copy items to an object owned by a different owner
// unless llAllowInventoryDrop has been called
@ -1049,7 +1049,7 @@ namespace OpenSim.Region.Environment.Scenes
}
// must have both move and modify permission to put an item in an object
if((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0 )
if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0)
{
return;
}
@ -1099,7 +1099,7 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence avatar;
if(TryGetAvatar(srcTaskItem.OwnerID, out avatar))
if (TryGetAvatar(srcTaskItem.OwnerID, out avatar))
{
destPart.GetProperties(avatar.ControllingClient);
}
@ -1108,7 +1108,7 @@ namespace OpenSim.Region.Environment.Scenes
public void MoveTaskInventoryItems(LLUUID destID, string category, SceneObjectPart host, List<LLUUID> items)
{
CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(destID);
if(profile == null || profile.RootFolder == null)
if (profile == null || profile.RootFolder == null)
{
m_log.ErrorFormat(
"[PRIM INVENTORY]: " +
@ -1325,8 +1325,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="itemID"> </param>
/// <param name="localID"></param>
public void RezScript(LLUUID srcId, SceneObjectPart srcPart, LLUUID destId, int pin, int running, int start_param)
{
TaskInventoryItem srcTaskItem = srcPart.GetInventoryItem(srcId);
{
TaskInventoryItem srcTaskItem = srcPart.GetInventoryItem(srcId);
if (srcTaskItem == null)
{
@ -1350,27 +1350,27 @@ namespace OpenSim.Region.Environment.Scenes
}
// Must own the object, and have modify rights
if(srcPart.OwnerID != destPart.OwnerID)
if (srcPart.OwnerID != destPart.OwnerID)
return;
if((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0)
return;
if (destPart.ScriptAccessPin != pin)
{
m_log.WarnFormat(
"[PRIM INVENTORY]: " +
"Script in object {0} : {1}, attempted to load script {2} : {3} into object {4} : {5} with invalid pin {6}",
srcPart.Name, srcId, srcTaskItem.Name, srcTaskItem.ItemID, destPart.Name, destId, pin);
// the LSL Wiki says we are supposed to shout on the DEBUG_CHANNEL -
// "Object: Task Object trying to illegally load script onto task Other_Object!"
// How do we shout from in here?
return;
}
if (destPart.ScriptAccessPin != pin)
{
m_log.WarnFormat(
"[PRIM INVENTORY]: " +
"Script in object {0} : {1}, attempted to load script {2} : {3} into object {4} : {5} with invalid pin {6}",
srcPart.Name, srcId, srcTaskItem.Name, srcTaskItem.ItemID, destPart.Name, destId, pin);
// the LSL Wiki says we are supposed to shout on the DEBUG_CHANNEL -
// "Object: Task Object trying to illegally load script onto task Other_Object!"
// How do we shout from in here?
return;
}
TaskInventoryItem destTaskItem = new TaskInventoryItem();
TaskInventoryItem destTaskItem = new TaskInventoryItem();
destTaskItem.ItemID = LLUUID.Random();
destTaskItem.ItemID = LLUUID.Random();
destTaskItem.CreatorID = srcTaskItem.CreatorID;
destTaskItem.AssetID = srcTaskItem.AssetID;
destTaskItem.GroupID = destPart.GroupID;
@ -1408,21 +1408,21 @@ namespace OpenSim.Region.Environment.Scenes
destPart.AddInventoryItemExclusive(destTaskItem);
if (running > 0)
{
if (ExternalChecks.ExternalChecksCanRunScript(destTaskItem.AssetID, destPart.UUID, destPart.OwnerID))
{
if (running > 0)
{
if (ExternalChecks.ExternalChecksCanRunScript(destTaskItem.AssetID, destPart.UUID, destPart.OwnerID))
{
destPart.CreateScriptInstance(destTaskItem, 0, false);
}
}
}
}
ScenePresence avatar;
ScenePresence avatar;
if(TryGetAvatar(srcTaskItem.OwnerID, out avatar))
if (TryGetAvatar(srcTaskItem.OwnerID, out avatar))
{
destPart.GetProperties(avatar.ControllingClient);
}
}
}
/// <summary>
/// Called when an object is removed from the environment into inventory.
@ -1497,7 +1497,7 @@ namespace OpenSim.Region.Environment.Scenes
m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;
}
lock(m_inventoryDeletes)
lock (m_inventoryDeletes)
{
DeleteToInventoryHolder dtis = new DeleteToInventoryHolder();
dtis.DeRezPacket = DeRezPacket;
@ -2246,7 +2246,7 @@ namespace OpenSim.Region.Environment.Scenes
public void GetScriptRunning(IClientAPI controllingClient, LLUUID objectID, LLUUID itemID)
{
IScriptModule scriptModule = RequestModuleInterface<IScriptModule>();
if(scriptModule == null)
if (scriptModule == null)
return;
controllingClient.SendScriptRunningReply(objectID, itemID,
@ -2256,10 +2256,10 @@ namespace OpenSim.Region.Environment.Scenes
public void SetScriptRunning(IClientAPI controllingClient, LLUUID objectID, LLUUID itemID, bool running)
{
SceneObjectPart part = GetSceneObjectPart(objectID);
if(part == null)
if (part == null)
return;
if(running)
if (running)
EventManager.TriggerStartScript(part.LocalId, itemID);
else
EventManager.TriggerStopScript(part.LocalId, itemID);

2
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Scenes
public void AddInventoryItemExclusive(TaskInventoryItem item)
{
List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_taskInventory.Values);
foreach(TaskInventoryItem i in il)
foreach (TaskInventoryItem i in il)
{
if (i.Name == item.Name)
{

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1,5 +1,3 @@
#region Header
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
@ -27,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#endregion Header
using System;
using System.Collections.Generic;
using System.Drawing;

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -1093,8 +1093,8 @@ namespace OpenSim.Region.Environment.Scenes
);
//look for prims with explicit sit targets that are available
foreach(SceneObjectPart part in partArray) {
foreach (SceneObjectPart part in partArray)
{
// Is a sit target available?
Vector3 avSitOffSet = part.GetSitTargetPosition();
Quaternion avSitOrientation = part.GetSitTargetOrientation();

72
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -3211,7 +3211,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
m_host.AddScriptLPS(1);
if(add != 0)
if (add != 0)
m_host.ParentGroup.RootPart.AllowedDrop = true;
else
m_host.ParentGroup.RootPart.AllowedDrop = false;
@ -4408,7 +4408,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if(inv.Value.Name == name)
if (inv.Value.Name == name)
return inv.Key;
}
return LLUUID.Zero;
@ -4419,7 +4419,7 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AddScriptLPS(1);
LLUUID destID;
if(!LLUUID.TryParse(destination, out destID))
if (!LLUUID.TryParse(destination, out destID))
return;
List<LLUUID> itemList = new List<LLUUID>();
@ -4427,19 +4427,19 @@ namespace OpenSim.Region.ScriptEngine.Common
foreach (Object item in inventory.Data)
{
LLUUID itemID;
if(LLUUID.TryParse(item.ToString(), out itemID))
if (LLUUID.TryParse(item.ToString(), out itemID))
{
itemList.Add(itemID);
}
else
{
itemID = GetTaskInventoryItem(item.ToString());
if(itemID != LLUUID.Zero)
if (itemID != LLUUID.Zero)
itemList.Add(itemID);
}
}
if(itemList.Count == 0)
if (itemList.Count == 0)
return;
m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList);
@ -4686,7 +4686,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
m_host.AddScriptLPS(1);
m_host.ScriptAccessPin = pin;
m_host.ScriptAccessPin = pin;
}
public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param)
@ -4702,37 +4702,37 @@ namespace OpenSim.Region.ScriptEngine.Common
return;
}
// target must be a different prim than the one containing the script
if (m_host.UUID == destId)
{
return;
}
// target must be a different prim than the one containing the script
if (m_host.UUID == destId)
{
return;
}
// copy the first script found with this inventory name
foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if (inv.Value.Name == name)
{
// make sure the object is a script
if(10 == inv.Value.Type)
{
found = true;
srcId = inv.Key;
break;
}
// make sure the object is a script
if (10 == inv.Value.Type)
{
found = true;
srcId = inv.Key;
break;
}
}
}
if (!found)
{
llSay(0, "Could not find script " + name);
return;
}
if (!found)
{
llSay(0, "Could not find script " + name);
return;
}
// the rest of the permission checks are done in RezScript, so check the pin there as well
// the rest of the permission checks are done in RezScript, so check the pin there as well
World.RezScript(srcId, m_host, destId, pin, running, start_param);
// this will cause the delay even if the script pin or permissions were wrong - seems ok
System.Threading.Thread.Sleep(3000);
// this will cause the delay even if the script pin or permissions were wrong - seems ok
System.Threading.Thread.Sleep(3000);
}
// remote_data(integer type, key channel, key message_id, string sender, integer ival, string sval)
@ -5073,14 +5073,14 @@ namespace OpenSim.Region.ScriptEngine.Common
shapeBlock.PathScaleX = 100;
shapeBlock.PathScaleY = 150;
if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER &&
type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE &&
type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE &&
type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS)
{
// default
type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE;
}
if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER &&
type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE &&
type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE &&
type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS)
{
// default
type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE;
}
// retain pathcurve
shapeBlock.PathCurve = m_host.Shape.PathCurve;
@ -5175,7 +5175,7 @@ namespace OpenSim.Region.ScriptEngine.Common
LSL_Types.Vector3 holesize;
LSL_Types.Vector3 profilecut;
switch(code)
switch (code)
{
case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX:
if (remain < 6)

4
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -1295,7 +1295,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public override bool Equals(Object o)
{
if(!(o is LSLInteger))
if (!(o is LSLInteger))
return false;
return value == ((LSLInteger)o).value;
}
@ -1452,7 +1452,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public override bool Equals(Object o)
{
if(!(o is LSLFloat))
if (!(o is LSLFloat))
return false;
return value == ((LSLFloat)o).value;
}

27
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs
View File

@ -1,3 +1,30 @@
/*
* 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 Tools;
//%+STRING_CONSTANT+3
public class STRING_CONSTANT : TOKEN{

1101
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.parser.cs
View File

File diff suppressed because it is too large Load Diff

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -132,7 +132,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID);
m_host.SetScriptEvents(itemID, eventFlags);
m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
if(postOnRez)
if (postOnRez)
{
m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(startParam) });
}

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

@ -2044,7 +2044,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
m_host.AddScriptLPS(1);
IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
if(emailModule == null)
if (emailModule == null)
return;
emailModule.SendEmail(m_host.UUID, address, subject, message);
@ -2054,13 +2054,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
m_host.AddScriptLPS(1);
IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
if(emailModule == null)
if (emailModule == null)
return;
Email email;
email = emailModule.GetNextEmail(m_host.UUID, address, subject);
if(email == null)
if (email == null)
return;
m_ScriptEngine.PostObjectEvent(m_host.LocalId,
@ -3163,7 +3163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
m_host.AddScriptLPS(1);
if(add != 0)
if (add != 0)
m_host.ParentGroup.RootPart.AllowedDrop = true;
else
m_host.ParentGroup.RootPart.AllowedDrop = false;
@ -4283,7 +4283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if(inv.Value.Name == name)
if (inv.Value.Name == name)
return inv.Key;
}
return LLUUID.Zero;
@ -4294,7 +4294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1);
LLUUID destID;
if(!LLUUID.TryParse(destination, out destID))
if (!LLUUID.TryParse(destination, out destID))
return;
List<LLUUID> itemList = new List<LLUUID>();
@ -4302,19 +4302,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
foreach (Object item in inventory.Data)
{
LLUUID itemID;
if(LLUUID.TryParse(item.ToString(), out itemID))
if (LLUUID.TryParse(item.ToString(), out itemID))
{
itemList.Add(itemID);
}
else
{
itemID = GetTaskInventoryItem(item.ToString());
if(itemID != LLUUID.Zero)
if (itemID != LLUUID.Zero)
itemList.Add(itemID);
}
}
if(itemList.Count == 0)
if (itemList.Count == 0)
return;
m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList);
@ -4985,7 +4985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Types.Vector3 holesize;
LSL_Types.Vector3 profilecut;
switch(code)
switch (code)
{
case (int)ScriptBaseClass.PRIM_TYPE_BOX:
if (remain < 6)

30
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -331,12 +331,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Object[] parms = new Object[]
{ localID, itemID, script, startParam, postOnRez};
lock(m_CompileQueue)
lock (m_CompileQueue)
{
m_CompileQueue.Enqueue(parms);
if(m_CurrentCompile == null)
if (m_CurrentCompile == null)
{
if(m_firstStart)
if (m_firstStart)
{
m_firstStart = false;
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
@ -355,9 +355,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
Thread.Sleep(30000);
lock(m_CompileQueue)
lock (m_CompileQueue)
{
if(m_CompileQueue.Count > 0)
if (m_CompileQueue.Count > 0)
{
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
new WorkItemCallback(
@ -374,10 +374,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
public Object DoOnRezScriptQueue(Object dummy)
{
Object o;
lock(m_CompileQueue)
lock (m_CompileQueue)
{
o = m_CompileQueue.Dequeue();
if(o == null)
if (o == null)
{
m_CurrentCompile = null;
return null;
@ -386,9 +386,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
DoOnRezScript(o);
lock(m_CompileQueue)
lock (m_CompileQueue)
{
if(m_CompileQueue.Count > 0)
if (m_CompileQueue.Count > 0)
{
m_CurrentCompile = m_ThreadPool.QueueWorkItem(
new WorkItemCallback(
@ -1056,7 +1056,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
m_RunEvents = false;
Start();
if(postOnRez)
if (postOnRez)
PostEvent(new EventParams("on_rez",
new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0]));
}
@ -1078,7 +1078,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Start();
PostEvent(new EventParams("state_entry",
new Object[0], new DetectParams[0]));
if(postOnRez)
if (postOnRez)
PostEvent(new EventParams("on_rez",
new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0]));
@ -1090,7 +1090,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Start();
PostEvent(new EventParams("state_entry",
new Object[0], new DetectParams[0]));
if(postOnRez)
if (postOnRez)
PostEvent(new EventParams("on_rez",
new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0]));
}
@ -1102,7 +1102,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
PostEvent(new EventParams("state_entry",
new Object[0], new DetectParams[0]));
if(postOnRez)
if (postOnRez)
PostEvent(new EventParams("on_rez",
new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0]));
}
@ -1215,7 +1215,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// m_Engine.Log.DebugFormat("[XEngine] Posted event {2} in state {3} to {0}.{1}",
// m_PrimName, m_ScriptName, data.EventName, m_State);
if(!Running)
if (!Running)
return;
lock (m_EventQueue)
@ -1393,7 +1393,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_Script.ResetVars();
m_Engine.m_AsyncCommands.RemoveScript(m_LocalID, m_ItemID);
if(m_CurrentEvent != "state_entry")
if (m_CurrentEvent != "state_entry")
{
PostEvent(new EventParams("state_entry",
new Object[0], new DetectParams[0]));