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

Minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-08-07 12:55:46 +00:00
parent dddf7bba4e
commit 0718aa0b7f
19 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
/// </summary>
private void loadTests()
{
lock(tests)
lock (tests)
{
if (!testsLoaded)
{

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

@ -744,9 +744,9 @@ namespace OpenSim.Data.MySQL
DataRow row = rawsettings[0];
RegionSettings newSettings = buildRegionSettings(row);
newSettings.OnSave += StoreRegionSettings;
newSettings.OnSave += StoreRegionSettings;
return newSettings;
return newSettings;
}
}

2
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL
else
m_FieldMap[name].SetValue(es, false);
}
else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
{
LLUUID uuid = LLUUID.Zero;

2
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

@ -109,7 +109,7 @@ namespace OpenSim.Data.SQLite
else
m_FieldMap[name].SetValue(es, false);
}
else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
{
LLUUID uuid = LLUUID.Zero;

2
OpenSim/Framework/IClientAPI.cs
View File

@ -318,7 +318,7 @@ namespace OpenSim.Framework
ulong ActiveGroupPowers { get; }
ulong GetGroupPowers(LLUUID groupID);
ulong GetGroupPowers(LLUUID groupID);
string FirstName { get; }

16
OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
View File

@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
protected LLUUID m_activeGroupID = LLUUID.Zero;
protected string m_activeGroupName = String.Empty;
protected ulong m_activeGroupPowers = 0;
protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
/* Instantiated Designated Event Delegates */
//- used so we don't create new objects for each incoming packet and then toss it out later */
@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
get { return m_activeGroupPowers; }
}
public ulong GetGroupPowers(LLUUID groupID)
{
if(m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID];
return 0;
}
public ulong GetGroupPowers(LLUUID groupID)
{
if (m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID];
return 0;
}
/// <summary>
/// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
@ -6291,7 +6291,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
packet.ObjectData.ObjectID = objectID;
SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
uint idx = 0;
foreach(KeyValuePair<int, float> pair in parameters)
foreach (KeyValuePair<int, float> pair in parameters)
{
SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
block.Type = pair.Key;

12
OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
View File

@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
private void AddAcks(ref Packet packet)
{
// This packet type has shown to have issues with
// acks being appended to the payload, just don't send
// any with this packet type until libsl is fixed.
//
if(packet is libsecondlife.Packets.ViewerEffectPacket)
return;
// This packet type has shown to have issues with
// acks being appended to the payload, just don't send
// any with this packet type until libsl is fixed.
//
if (packet is libsecondlife.Packets.ViewerEffectPacket)
return;
// Add acks to outgoing packets
//

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

@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected LLUUID m_activeGroupID = LLUUID.Zero;
protected string m_activeGroupName = String.Empty;
protected ulong m_activeGroupPowers = 0;
protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
/* Instantiated Designated Event Delegates */
//- used so we don't create new objects for each incoming packet and then toss it out later */
@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
get { return m_activeGroupPowers; }
}
public ulong GetGroupPowers(LLUUID groupID)
{
if(m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID];
return 0;
}
public ulong GetGroupPowers(LLUUID groupID)
{
if (m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID];
return 0;
}
/// <summary>
/// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
@ -6292,7 +6292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
packet.ObjectData.ObjectID = objectID;
SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
uint idx = 0;
foreach(KeyValuePair<int, float> pair in parameters)
foreach (KeyValuePair<int, float> pair in parameters)
{
SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
block.Type = pair.Key;

12
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void AddAcks(ref Packet packet)
{
// This packet type has shown to have issues with
// acks being appended to the payload, just don't send
// any with this packet type until libsl is fixed.
//
if(packet is libsecondlife.Packets.ViewerEffectPacket)
return;
// This packet type has shown to have issues with
// acks being appended to the payload, just don't send
// any with this packet type until libsl is fixed.
//
if (packet is libsecondlife.Packets.ViewerEffectPacket)
return;
// Add acks to outgoing packets
//

10
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@ -121,7 +121,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture)
{
if(texture == LLUUID.Zero)
if (texture == LLUUID.Zero)
return;
switch (corner)
@ -761,10 +761,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
if (m_scene.RegionInfo.RegionSettings.Sandbox)
flags |= Simulator.RegionFlags.Sandbox;
// Fudge these to always on, so the menu options activate
//
flags |= Simulator.RegionFlags.AllowLandmark;
flags |= Simulator.RegionFlags.AllowSetHome;
// Fudge these to always on, so the menu options activate
//
flags |= Simulator.RegionFlags.AllowLandmark;
flags |= Simulator.RegionFlags.AllowSetHome;
// TODO: SkipUpdateInterestList

4
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@ -166,8 +166,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
if (estateModule != null)
regionFlags = estateModule.GetRegionFlags();
// In a perfect world, this would have worked.
//
// In a perfect world, this would have worked.
//
// if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
// regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark;
// if (landData.OwnerID == remote_client.AgentId)

8
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -365,10 +365,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
get { return 0; }
}
public ulong GetGroupPowers(LLUUID groupID)
{
return 0;
}
public ulong GetGroupPowers(LLUUID groupID)
{
return 0;
}
public virtual int NextAnimationSequenceNumber
{

2
OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
View File

@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
set
{
// Will "fix" terrain hole problems. Although not fantastically.
if(Double.IsNaN(value) || Double.IsInfinity(value))
if (Double.IsNaN(value) || Double.IsInfinity(value))
return;
if (map[x, y] != value)

8
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -277,10 +277,10 @@ namespace OpenSim.Region.Examples.SimpleModule
get { return 0; }
}
public ulong GetGroupPowers(LLUUID groupID)
{
return 0;
}
public ulong GetGroupPowers(LLUUID groupID)
{
return 0;
}
public virtual int NextAnimationSequenceNumber
{

2
OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
View File

@ -2426,7 +2426,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
public static readonly rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0);
// constants for llSetCameraParams
// constants for llSetCameraParams
public const int CAMERA_PITCH = 0;
public const int CAMERA_FOCUS_OFFSET = 1;
public const int CAMERA_FOCUS_OFFSET_X = 2;

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

@ -6924,7 +6924,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// the object we are in
LLUUID objectID = m_host.ParentUUID;
if(objectID == LLUUID.Zero) return;
if (objectID == LLUUID.Zero) return;
// we need the permission first, to know which avatar we want to set the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6934,16 +6934,16 @@ namespace OpenSim.Region.ScriptEngine.Common
ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents
if(presence.IsChildAgent) return;
if (presence.IsChildAgent) return;
SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
object[] data = rules.Data;
for(int i = 0; i < data.Length; ++i) {
for (int i = 0; i < data.Length; ++i) {
int type = Convert.ToInt32(data[i++]);
if(i >= data.Length) break; // odd number of entries => ignore the last
if (i >= data.Length) break; // odd number of entries => ignore the last
// some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
switch(type) {
switch (type) {
case BuiltIn_Commands_BaseClass.CAMERA_FOCUS:
case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET:
case BuiltIn_Commands_BaseClass.CAMERA_POSITION:
@ -6954,15 +6954,15 @@ namespace OpenSim.Region.ScriptEngine.Common
break;
default:
// TODO: clean that up as soon as the implicit casts are in
if(data[i] is LSL_Types.LSLFloat)
if (data[i] is LSL_Types.LSLFloat)
parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value);
else if(data[i] is LSL_Types.LSLInteger)
else if (data[i] is LSL_Types.LSLInteger)
parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value);
else parameters.Add(type, Convert.ToSingle(data[i]));
break;
}
}
if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
}
public void llClearCameraParams()
@ -6975,7 +6975,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// the object we are in
LLUUID objectID = m_host.ParentUUID;
if(objectID == LLUUID.Zero) return;
if (objectID == LLUUID.Zero) return;
// we need the permission first, to know which avatar we want to clear the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6985,7 +6985,7 @@ namespace OpenSim.Region.ScriptEngine.Common
ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents
if(presence.IsChildAgent) return;
if (presence.IsChildAgent) return;
presence.ControllingClient.SendClearFollowCamProperties(objectID);
}

4
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -158,8 +158,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
/// </summary>
private void EventQueueThreadLoop()
{
CultureInfo USCulture = new CultureInfo("en-US");
Thread.CurrentThread.CurrentCulture = USCulture;
CultureInfo USCulture = new CultureInfo("en-US");
Thread.CurrentThread.CurrentCulture = USCulture;
//myScriptEngine.Log.Info("[" + ScriptEngineName + "]: EventQueueManager Worker thread spawned");
try

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

@ -6702,7 +6702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// the object we are in
LLUUID objectID = m_host.ParentUUID;
if(objectID == LLUUID.Zero) return;
if (objectID == LLUUID.Zero) return;
// we need the permission first, to know which avatar we want to set the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6712,16 +6712,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents
if(presence.IsChildAgent) return;
if (presence.IsChildAgent) return;
SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
object[] data = rules.Data;
for(int i = 0; i < data.Length; ++i) {
for (int i = 0; i < data.Length; ++i) {
int type = Convert.ToInt32(data[i++]);
if(i >= data.Length) break; // odd number of entries => ignore the last
if (i >= data.Length) break; // odd number of entries => ignore the last
// some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
switch(type) {
switch (type) {
case ScriptBaseClass.CAMERA_FOCUS:
case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
case ScriptBaseClass.CAMERA_POSITION:
@ -6732,15 +6732,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break;
default:
// TODO: clean that up as soon as the implicit casts are in
if(data[i] is LSL_Types.LSLFloat)
if (data[i] is LSL_Types.LSLFloat)
parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value);
else if(data[i] is LSL_Types.LSLInteger)
else if (data[i] is LSL_Types.LSLInteger)
parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value);
else parameters.Add(type, Convert.ToSingle(data[i]));
break;
}
}
if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
}
public void llClearCameraParams()
@ -6753,7 +6753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// the object we are in
LLUUID objectID = m_host.ParentUUID;
if(objectID == LLUUID.Zero) return;
if (objectID == LLUUID.Zero) return;
// we need the permission first, to know which avatar we want to clear the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6763,7 +6763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents
if(presence.IsChildAgent) return;
if (presence.IsChildAgent) return;
presence.ControllingClient.SendClearFollowCamProperties(objectID);
}

16
OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
View File

@ -1401,7 +1401,7 @@ default
{
state_entry()
{
while(1<0);
while (1<0);
}
}";
@ -1426,7 +1426,7 @@ default
state_entry()
{
do;
while(1<0);
while (1<0);
}
}";
@ -1451,7 +1451,7 @@ default
{
state_entry()
{
if(1<0);
if (1<0);
}
}";
@ -1475,7 +1475,7 @@ default
{
state_entry()
{
if(1<0);
if (1<0);
else;
}
}";
@ -1502,7 +1502,7 @@ default
{
state_entry()
{
for(x = 4; 1<0; x += 2);
for (x = 4; 1<0; x += 2);
}
}";
@ -1528,13 +1528,13 @@ default
{
integer x;
while(x = 14) llOwnerSay(""x is: "" + (string) x);
while (x = 14) llOwnerSay(""x is: "" + (string) x);
if(x = 24) llOwnerSay(""x is: "" + (string) x);
if (x = 24) llOwnerSay(""x is: "" + (string) x);
do
llOwnerSay(""x is: "" + (string) x);
while(x = 44);
while (x = 44);
}
}";