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> /// </summary>
private void loadTests() private void loadTests()
{ {
lock(tests) lock (tests)
{ {
if (!testsLoaded) if (!testsLoaded)
{ {

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

@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL
else else
m_FieldMap[name].SetValue(es, false); 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; LLUUID uuid = LLUUID.Zero;

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

@ -109,7 +109,7 @@ namespace OpenSim.Data.SQLite
else else
m_FieldMap[name].SetValue(es, false); 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; LLUUID uuid = LLUUID.Zero;

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

@ -295,7 +295,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
public ulong GetGroupPowers(LLUUID groupID) public ulong GetGroupPowers(LLUUID groupID)
{ {
if(m_groupPowers.ContainsKey(groupID)) if (m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID]; return m_groupPowers[groupID];
return 0; return 0;
} }
@ -6291,7 +6291,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
packet.ObjectData.ObjectID = objectID; packet.ObjectData.ObjectID = objectID;
SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
uint idx = 0; uint idx = 0;
foreach(KeyValuePair<int, float> pair in parameters) foreach (KeyValuePair<int, float> pair in parameters)
{ {
SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
block.Type = pair.Key; block.Type = pair.Key;

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

@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
// acks being appended to the payload, just don't send // acks being appended to the payload, just don't send
// any with this packet type until libsl is fixed. // any with this packet type until libsl is fixed.
// //
if(packet is libsecondlife.Packets.ViewerEffectPacket) if (packet is libsecondlife.Packets.ViewerEffectPacket)
return; return;
// Add acks to outgoing packets // Add acks to outgoing packets

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

@ -295,7 +295,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public ulong GetGroupPowers(LLUUID groupID) public ulong GetGroupPowers(LLUUID groupID)
{ {
if(m_groupPowers.ContainsKey(groupID)) if (m_groupPowers.ContainsKey(groupID))
return m_groupPowers[groupID]; return m_groupPowers[groupID];
return 0; return 0;
} }
@ -6292,7 +6292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
packet.ObjectData.ObjectID = objectID; packet.ObjectData.ObjectID = objectID;
SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
uint idx = 0; uint idx = 0;
foreach(KeyValuePair<int, float> pair in parameters) foreach (KeyValuePair<int, float> pair in parameters)
{ {
SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
block.Type = pair.Key; block.Type = pair.Key;

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

@ -252,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// acks being appended to the payload, just don't send // acks being appended to the payload, just don't send
// any with this packet type until libsl is fixed. // any with this packet type until libsl is fixed.
// //
if(packet is libsecondlife.Packets.ViewerEffectPacket) if (packet is libsecondlife.Packets.ViewerEffectPacket)
return; return;
// Add acks to outgoing packets // Add acks to outgoing packets

2
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) public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture)
{ {
if(texture == LLUUID.Zero) if (texture == LLUUID.Zero)
return; return;
switch (corner) switch (corner)

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

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

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 // the object we are in
LLUUID objectID = m_host.ParentUUID; 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 // we need the permission first, to know which avatar we want to set the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6934,16 +6934,16 @@ namespace OpenSim.Region.ScriptEngine.Common
ScenePresence presence = World.GetScenePresence(agentID); ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents // we are not interested in child-agents
if(presence.IsChildAgent) return; if (presence.IsChildAgent) return;
SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
object[] data = rules.Data; 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++]); 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) // 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:
case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET: case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET:
case BuiltIn_Commands_BaseClass.CAMERA_POSITION: case BuiltIn_Commands_BaseClass.CAMERA_POSITION:
@ -6954,15 +6954,15 @@ namespace OpenSim.Region.ScriptEngine.Common
break; break;
default: default:
// TODO: clean that up as soon as the implicit casts are in // 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); 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); parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value);
else parameters.Add(type, Convert.ToSingle(data[i])); else parameters.Add(type, Convert.ToSingle(data[i]));
break; break;
} }
} }
if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
} }
public void llClearCameraParams() public void llClearCameraParams()
@ -6975,7 +6975,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// the object we are in // the object we are in
LLUUID objectID = m_host.ParentUUID; 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 // we need the permission first, to know which avatar we want to clear the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6985,7 +6985,7 @@ namespace OpenSim.Region.ScriptEngine.Common
ScenePresence presence = World.GetScenePresence(agentID); ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents // we are not interested in child-agents
if(presence.IsChildAgent) return; if (presence.IsChildAgent) return;
presence.ControllingClient.SendClearFollowCamProperties(objectID); presence.ControllingClient.SendClearFollowCamProperties(objectID);
} }

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 // the object we are in
LLUUID objectID = m_host.ParentUUID; 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 // we need the permission first, to know which avatar we want to set the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6712,16 +6712,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence presence = World.GetScenePresence(agentID); ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents // we are not interested in child-agents
if(presence.IsChildAgent) return; if (presence.IsChildAgent) return;
SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
object[] data = rules.Data; 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++]); 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) // 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:
case ScriptBaseClass.CAMERA_FOCUS_OFFSET: case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
case ScriptBaseClass.CAMERA_POSITION: case ScriptBaseClass.CAMERA_POSITION:
@ -6732,15 +6732,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break; break;
default: default:
// TODO: clean that up as soon as the implicit casts are in // 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); 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); parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value);
else parameters.Add(type, Convert.ToSingle(data[i])); else parameters.Add(type, Convert.ToSingle(data[i]));
break; break;
} }
} }
if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
} }
public void llClearCameraParams() public void llClearCameraParams()
@ -6753,7 +6753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// the object we are in // the object we are in
LLUUID objectID = m_host.ParentUUID; 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 // we need the permission first, to know which avatar we want to clear the camera for
LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@ -6763,7 +6763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
ScenePresence presence = World.GetScenePresence(agentID); ScenePresence presence = World.GetScenePresence(agentID);
// we are not interested in child-agents // we are not interested in child-agents
if(presence.IsChildAgent) return; if (presence.IsChildAgent) return;
presence.ControllingClient.SendClearFollowCamProperties(objectID); presence.ControllingClient.SendClearFollowCamProperties(objectID);
} }

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

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