Minor formatting cleanup.
parent
dddf7bba4e
commit
0718aa0b7f
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -744,9 +744,9 @@ namespace OpenSim.Data.MySQL
|
||||||
DataRow row = rawsettings[0];
|
DataRow row = rawsettings[0];
|
||||||
|
|
||||||
RegionSettings newSettings = buildRegionSettings(row);
|
RegionSettings newSettings = buildRegionSettings(row);
|
||||||
newSettings.OnSave += StoreRegionSettings;
|
newSettings.OnSave += StoreRegionSettings;
|
||||||
|
|
||||||
return newSettings;
|
return newSettings;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -318,7 +318,7 @@ namespace OpenSim.Framework
|
||||||
|
|
||||||
ulong ActiveGroupPowers { get; }
|
ulong ActiveGroupPowers { get; }
|
||||||
|
|
||||||
ulong GetGroupPowers(LLUUID groupID);
|
ulong GetGroupPowers(LLUUID groupID);
|
||||||
|
|
||||||
string FirstName { get; }
|
string FirstName { get; }
|
||||||
|
|
||||||
|
|
|
@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
|
||||||
protected LLUUID m_activeGroupID = LLUUID.Zero;
|
protected LLUUID m_activeGroupID = LLUUID.Zero;
|
||||||
protected string m_activeGroupName = String.Empty;
|
protected string m_activeGroupName = String.Empty;
|
||||||
protected ulong m_activeGroupPowers = 0;
|
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 */
|
/* Instantiated Designated Event Delegates */
|
||||||
//- used so we don't create new objects for each incoming packet and then toss it out later */
|
//- 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; }
|
get { return m_activeGroupPowers; }
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
|
/// 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;
|
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;
|
||||||
|
|
|
@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
|
||||||
|
|
||||||
private void AddAcks(ref Packet packet)
|
private void AddAcks(ref Packet packet)
|
||||||
{
|
{
|
||||||
// This packet type has shown to have issues with
|
// This packet type has shown to have issues with
|
||||||
// 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
|
||||||
//
|
//
|
||||||
|
|
|
@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
protected LLUUID m_activeGroupID = LLUUID.Zero;
|
protected LLUUID m_activeGroupID = LLUUID.Zero;
|
||||||
protected string m_activeGroupName = String.Empty;
|
protected string m_activeGroupName = String.Empty;
|
||||||
protected ulong m_activeGroupPowers = 0;
|
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 */
|
/* Instantiated Designated Event Delegates */
|
||||||
//- used so we don't create new objects for each incoming packet and then toss it out later */
|
//- 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; }
|
get { return m_activeGroupPowers; }
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
|
/// 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;
|
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;
|
||||||
|
|
|
@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
private void AddAcks(ref Packet packet)
|
private void AddAcks(ref Packet packet)
|
||||||
{
|
{
|
||||||
// This packet type has shown to have issues with
|
// This packet type has shown to have issues with
|
||||||
// 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
|
||||||
//
|
//
|
||||||
|
|
|
@ -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)
|
||||||
|
@ -761,10 +761,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
|
||||||
if (m_scene.RegionInfo.RegionSettings.Sandbox)
|
if (m_scene.RegionInfo.RegionSettings.Sandbox)
|
||||||
flags |= Simulator.RegionFlags.Sandbox;
|
flags |= Simulator.RegionFlags.Sandbox;
|
||||||
|
|
||||||
// Fudge these to always on, so the menu options activate
|
// Fudge these to always on, so the menu options activate
|
||||||
//
|
//
|
||||||
flags |= Simulator.RegionFlags.AllowLandmark;
|
flags |= Simulator.RegionFlags.AllowLandmark;
|
||||||
flags |= Simulator.RegionFlags.AllowSetHome;
|
flags |= Simulator.RegionFlags.AllowSetHome;
|
||||||
|
|
||||||
// TODO: SkipUpdateInterestList
|
// TODO: SkipUpdateInterestList
|
||||||
|
|
||||||
|
|
|
@ -166,8 +166,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
|
||||||
if (estateModule != null)
|
if (estateModule != null)
|
||||||
regionFlags = estateModule.GetRegionFlags();
|
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)
|
// if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
|
||||||
// regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark;
|
// regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark;
|
||||||
// if (landData.OwnerID == remote_client.AgentId)
|
// if (landData.OwnerID == remote_client.AgentId)
|
||||||
|
|
|
@ -365,10 +365,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
|
||||||
get { return 0; }
|
get { return 0; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public ulong GetGroupPowers(LLUUID groupID)
|
public ulong GetGroupPowers(LLUUID groupID)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual int NextAnimationSequenceNumber
|
public virtual int NextAnimationSequenceNumber
|
||||||
{
|
{
|
||||||
|
|
|
@ -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)
|
||||||
|
@ -231,4 +231,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -277,10 +277,10 @@ namespace OpenSim.Region.Examples.SimpleModule
|
||||||
get { return 0; }
|
get { return 0; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public ulong GetGroupPowers(LLUUID groupID)
|
public ulong GetGroupPowers(LLUUID groupID)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual int NextAnimationSequenceNumber
|
public virtual int NextAnimationSequenceNumber
|
||||||
{
|
{
|
||||||
|
|
|
@ -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 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);
|
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_PITCH = 0;
|
||||||
public const int CAMERA_FOCUS_OFFSET = 1;
|
public const int CAMERA_FOCUS_OFFSET = 1;
|
||||||
public const int CAMERA_FOCUS_OFFSET_X = 2;
|
public const int CAMERA_FOCUS_OFFSET_X = 2;
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,8 +158,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void EventQueueThreadLoop()
|
private void EventQueueThreadLoop()
|
||||||
{
|
{
|
||||||
CultureInfo USCulture = new CultureInfo("en-US");
|
CultureInfo USCulture = new CultureInfo("en-US");
|
||||||
Thread.CurrentThread.CurrentCulture = USCulture;
|
Thread.CurrentThread.CurrentCulture = USCulture;
|
||||||
|
|
||||||
//myScriptEngine.Log.Info("[" + ScriptEngineName + "]: EventQueueManager Worker thread spawned");
|
//myScriptEngine.Log.Info("[" + ScriptEngineName + "]: EventQueueManager Worker thread spawned");
|
||||||
try
|
try
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}";
|
}";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue