aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorJeff Ames2008-08-28 14:41:54 +0000
committerJeff Ames2008-08-28 14:41:54 +0000
commit3bf88587277b83c0b6f058fabba7d46a3b5a6a00 (patch)
treeed4ad9dc27e649a6f52661665fb681984251f480 /OpenSim/Region/ScriptEngine/Shared/Api
parentThannk you, Ralphos, for a patch the corrects an improper cast in (diff)
downloadopensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.zip
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.gz
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.bz2
opensim-SC_OLD-3bf88587277b83c0b6f058fabba7d46a3b5a6a00.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b48edfb..b5ca167 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2130,7 +2130,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2130 { 2130 {
2131 float dist = (float)llVecMag(llGetPos() - pos); 2131 float dist = (float)llVecMag(llGetPos() - pos);
2132 2132
2133 if(dist > m_ScriptDistanceFactor * 10.0f) 2133 if (dist > m_ScriptDistanceFactor * 10.0f)
2134 return; 2134 return;
2135 2135
2136 m_host.AddScriptLPS(1); 2136 m_host.AddScriptLPS(1);
@@ -5735,8 +5735,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5735 case (int)ScriptBaseClass.PRIM_POINT_LIGHT: 5735 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
5736 if (remain < 5) 5736 if (remain < 5)
5737 return; 5737 return;
5738 LSL_Types.LSLInteger light = new LSL_Types.LSLInteger(rules.Data[idx++].ToString()); 5738 LSL_Types.LSLInteger light = new LSL_Types.LSLInteger(rules.Data[idx++].ToString());
5739 LSL_Types.Vector3 lightcolor =new LSL_Types.Vector3(rules.Data[idx++].ToString()); 5739 LSL_Types.Vector3 lightcolor = new LSL_Types.Vector3(rules.Data[idx++].ToString());
5740 float intensity = (float)Convert.ToDouble(rules.Data[idx++]); 5740 float intensity = (float)Convert.ToDouble(rules.Data[idx++]);
5741 float radius = (float)Convert.ToDouble(rules.Data[idx++]); 5741 float radius = (float)Convert.ToDouble(rules.Data[idx++]);
5742 float falloff = (float)Convert.ToDouble(rules.Data[idx++]); 5742 float falloff = (float)Convert.ToDouble(rules.Data[idx++]);
@@ -6895,10 +6895,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6895 { 6895 {
6896 case 5: // DATA_SIM_POS 6896 case 5: // DATA_SIM_POS
6897 if (info == null) 6897 if (info == null)
6898 { 6898 {
6899 // ScriptSleep(1000); 6899 // ScriptSleep(1000);
6900 return LLUUID.Zero.ToString(); 6900 return LLUUID.Zero.ToString();
6901 } 6901 }
6902 reply = new LSL_Types.Vector3( 6902 reply = new LSL_Types.Vector3(
6903 info.RegionLocX * Constants.RegionSize, 6903 info.RegionLocX * Constants.RegionSize,
6904 info.RegionLocY * Constants.RegionSize, 6904 info.RegionLocY * Constants.RegionSize,
@@ -6912,10 +6912,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6912 break; 6912 break;
6913 case 7: // DATA_SIM_RATING 6913 case 7: // DATA_SIM_RATING
6914 if (info == null) 6914 if (info == null)
6915 { 6915 {
6916 // ScriptSleep(1000); 6916 // ScriptSleep(1000);
6917 return LLUUID.Zero.ToString(); 6917 return LLUUID.Zero.ToString();
6918 } 6918 }
6919 int access = info.RegionSettings.Maturity; 6919 int access = info.RegionSettings.Maturity;
6920 if (access == 0) 6920 if (access == 0)
6921 reply = "PG"; 6921 reply = "PG";
@@ -6928,7 +6928,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6928 reply = m_ScriptEngine.World.GetSimulatorVersion(); 6928 reply = m_ScriptEngine.World.GetSimulatorVersion();
6929 break; 6929 break;
6930 default: 6930 default:
6931 // ScriptSleep(1000); 6931 // ScriptSleep(1000);
6932 return LLUUID.Zero.ToString(); // Raise no event 6932 return LLUUID.Zero.ToString(); // Raise no event
6933 } 6933 }
6934 LLUUID rq = LLUUID.Random(); 6934 LLUUID rq = LLUUID.Random();
@@ -6939,7 +6939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6939 AsyncCommands. 6939 AsyncCommands.
6940 DataserverPlugin.DataserverReply(rq.ToString(), reply); 6940 DataserverPlugin.DataserverReply(rq.ToString(), reply);
6941 6941
6942 // ScriptSleep(1000); 6942 // ScriptSleep(1000);
6943 return tid.ToString(); 6943 return tid.ToString();
6944 } 6944 }
6945 catch(Exception e) 6945 catch(Exception e)
@@ -7910,7 +7910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7910 AsyncCommands. 7910 AsyncCommands.
7911 DataserverPlugin.DataserverReply(item.AssetID.ToString(), 7911 DataserverPlugin.DataserverReply(item.AssetID.ToString(),
7912 NotecardCache.GetLines(item.AssetID).ToString()); 7912 NotecardCache.GetLines(item.AssetID).ToString());
7913 // ScriptSleep(100); 7913 // ScriptSleep(100);
7914 return tid.ToString(); 7914 return tid.ToString();
7915 } 7915 }
7916 WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a) 7916 WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a)
@@ -7924,7 +7924,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7924 DataserverPlugin.DataserverReply(id.ToString(), 7924 DataserverPlugin.DataserverReply(id.ToString(),
7925 NotecardCache.GetLines(id).ToString()); 7925 NotecardCache.GetLines(id).ToString());
7926 }); 7926 });
7927 // ScriptSleep(100); 7927 // ScriptSleep(100);
7928 return tid.ToString(); 7928 return tid.ToString();
7929 } 7929 }
7930 } 7930 }
@@ -7948,7 +7948,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7948 AsyncCommands. 7948 AsyncCommands.
7949 DataserverPlugin.DataserverReply(item.AssetID.ToString(), 7949 DataserverPlugin.DataserverReply(item.AssetID.ToString(),
7950 NotecardCache.GetLine(item.AssetID, line)); 7950 NotecardCache.GetLine(item.AssetID, line));
7951 // ScriptSleep(100); 7951 // ScriptSleep(100);
7952 return tid.ToString(); 7952 return tid.ToString();
7953 } 7953 }
7954 WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a) 7954 WithNotecard(item.AssetID, delegate (LLUUID id, AssetBase a)
@@ -7963,7 +7963,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7963 NotecardCache.GetLine(id, line)); 7963 NotecardCache.GetLine(id, line));
7964 }); 7964 });
7965 7965
7966 // ScriptSleep(100); 7966 // ScriptSleep(100);
7967 return tid.ToString(); 7967 return tid.ToString();
7968 } 7968 }
7969 } 7969 }