aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJeff Ames2008-06-13 00:21:53 +0000
committerJeff Ames2008-06-13 00:21:53 +0000
commit64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94 (patch)
tree74c4e8fdc25dc28da7c63cbc9d97141c0f344938 /OpenSim/Region/ScriptEngine
parentlook mom, migrations in action. This adds a couple of indexes (diff)
downloadopensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.zip
opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.gz
opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.bz2
opensim-SC_OLD-64f01ade04863dbe7b392ea8f0fc4dcc8e32bd94.tar.xz
Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
index b18c867..d901c21 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/LSL_ScriptCommands.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
112 public void llSay(int channelID, string text) 112 public void llSay(int channelID, string text)
113 { 113 {
114 m_host.AddScriptLPS(1); 114 m_host.AddScriptLPS(1);
115 115
116 if (text.Length > 1023) 116 if (text.Length > 1023)
117 text = text.Substring(0, 1023); 117 text = text.Substring(0, 1023);
118 118
@@ -176,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
176 176
177 177
178 /// <summary> 178 /// <summary>
179 /// accepts a valid LLUUID, -or- a name of an inventory item. 179 /// accepts a valid LLUUID, -or- a name of an inventory item.
180 /// Returns a valid LLUUID or LLUUID.Zero if key invalid and item not found 180 /// Returns a valid LLUUID or LLUUID.Zero if key invalid and item not found
181 /// in prim inventory. 181 /// in prim inventory.
182 /// </summary> 182 /// </summary>
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
430 public void llWhisper(int channelID, string text) 430 public void llWhisper(int channelID, string text)
431 { 431 {
432 m_host.AddScriptLPS(1); 432 m_host.AddScriptLPS(1);
433 433
434 if (text.Length > 1023) 434 if (text.Length > 1023)
435 text = text.Substring(0, 1023); 435 text = text.Substring(0, 1023);
436 436
@@ -444,7 +444,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
444 public void llShout(int channelID, string text) 444 public void llShout(int channelID, string text)
445 { 445 {
446 m_host.AddScriptLPS(1); 446 m_host.AddScriptLPS(1);
447 447
448 if (text.Length > 1023) 448 if (text.Length > 1023)
449 text = text.Substring(0, 1023); 449 text = text.Substring(0, 1023);
450 450
@@ -920,7 +920,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
920 } 920 }
921 } 921 }
922 922
923 private void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 923 private void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
924 float wind, float tension, LSL_Types.Vector3 Force) 924 float wind, float tension, LSL_Types.Vector3 Force)
925 { 925 {
926 if (part == null) 926 if (part == null)
@@ -933,7 +933,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
933 { 933 {
934 needs_fakedelete = true; 934 needs_fakedelete = true;
935 } 935 }
936 part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do 936 part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do
937 // work once the prim is already flexi 937 // work once the prim is already flexi
938 part.Shape.FlexiSoftness = softness; 938 part.Shape.FlexiSoftness = softness;
939 part.Shape.FlexiGravity = gravity; 939 part.Shape.FlexiGravity = gravity;
@@ -1482,7 +1482,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1482 m_host.Sound = LLUUID.Zero; 1482 m_host.Sound = LLUUID.Zero;
1483 m_host.SoundGain = 0; 1483 m_host.SoundGain = 0;
1484 m_host.SoundFlags = 0; 1484 m_host.SoundFlags = 0;
1485 m_host.SoundRadius = 0; 1485 m_host.SoundRadius = 0;
1486 1486
1487 m_host.ScheduleFullUpdate(); 1487 m_host.ScheduleFullUpdate();
1488 m_host.SendFullUpdateToAllClients(); 1488 m_host.SendFullUpdateToAllClients();
@@ -4542,7 +4542,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
4542 4542
4543 v=new LSL_Types.Vector3(rules.Data[idx++].ToString()); 4543 v=new LSL_Types.Vector3(rules.Data[idx++].ToString());
4544 SetScale(part, v); 4544 SetScale(part, v);
4545 4545
4546 break; 4546 break;
4547 case 8: // PRIM_ROTATION 4547 case 8: // PRIM_ROTATION
4548 if (remain < 1) 4548 if (remain < 1)
@@ -4605,7 +4605,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
4605 float intensity = (float)Convert.ToDouble(rules.Data[idx++]); 4605 float intensity = (float)Convert.ToDouble(rules.Data[idx++]);
4606 float radius = (float)Convert.ToDouble(rules.Data[idx++]); 4606 float radius = (float)Convert.ToDouble(rules.Data[idx++]);
4607 float falloff = (float)Convert.ToDouble(rules.Data[idx++]); 4607 float falloff = (float)Convert.ToDouble(rules.Data[idx++]);
4608 4608
4609 SetPointLight(part, (light == 1), lightcolor, intensity, radius, falloff); 4609 SetPointLight(part, (light == 1), lightcolor, intensity, radius, falloff);
4610 4610
4611 break; 4611 break;
@@ -5514,7 +5514,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
5514 IConfigSource config = new IniConfigSource(Application.iniFilePath); 5514 IConfigSource config = new IniConfigSource(Application.iniFilePath);
5515 if (config.Configs["XEngine"] == null) 5515 if (config.Configs["XEngine"] == null)
5516 config.AddConfig("XEngine"); 5516 config.AddConfig("XEngine");
5517 5517
5518 if (config.Configs["XEngine"].GetBoolean("AllowGodFunctions", false)) 5518 if (config.Configs["XEngine"].GetBoolean("AllowGodFunctions", false))
5519 { 5519 {
5520 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID)) 5520 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID))
@@ -5576,7 +5576,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
5576 { 5576 {
5577 m_host.AddScriptLPS(1); 5577 m_host.AddScriptLPS(1);
5578 NotImplemented("llSetInventoryPermMask"); 5578 NotImplemented("llSetInventoryPermMask");
5579 } 5579 }
5580 5580
5581 public string llGetInventoryCreator(string item) 5581 public string llGetInventoryCreator(string item)
5582 { 5582 {
@@ -6451,7 +6451,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
6451 6451
6452 private static Dictionary<LLUUID, Notecard> m_Notecards = 6452 private static Dictionary<LLUUID, Notecard> m_Notecards =
6453 new Dictionary<LLUUID, Notecard>(); 6453 new Dictionary<LLUUID, Notecard>();
6454 6454
6455 public static void Cache(LLUUID assetID, string text) 6455 public static void Cache(LLUUID assetID, string text)
6456 { 6456 {
6457 CacheCheck(); 6457 CacheCheck();
@@ -6523,7 +6523,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
6523 count += ln.Length + 1; 6523 count += ln.Length + 1;
6524 idx++; 6524 idx++;
6525 } 6525 }
6526 6526
6527 return output.ToArray(); 6527 return output.ToArray();
6528 } 6528 }
6529 break; 6529 break;