ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-08-07 12:55:46 +00:00
parent dddf7bba4e
commit 0718aa0b7f
19 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}