aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2008-09-13 21:39:26 +0000
committerJeff Ames2008-09-13 21:39:26 +0000
commit6e6465f6c13ad83b0bbb64fde3aa8da644c986e1 (patch)
treec36b49455fbd7f621a98a352cb3b8088c8f5071f /OpenSim/Region
parentFix another missing UUID before a ToString(). (diff)
downloadopensim-SC_OLD-6e6465f6c13ad83b0bbb64fde3aa8da644c986e1.zip
opensim-SC_OLD-6e6465f6c13ad83b0bbb64fde3aa8da644c986e1.tar.gz
opensim-SC_OLD-6e6465f6c13ad83b0bbb64fde3aa8da644c986e1.tar.bz2
opensim-SC_OLD-6e6465f6c13ad83b0bbb64fde3aa8da644c986e1.tar.xz
Update svn properties. Minor formatting cleanup. Fix some minor typos. Remove some old dead code.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs20
2 files changed, 4 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9595588..7b21832 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -58,7 +58,7 @@ using System.Collections;
58 * //TODO 58 * //TODO
59 * 59 *
60 * This probably needs some throttling mechanism but 60 * This probably needs some throttling mechanism but
61 * its wide open right now. This applies to both 61 * it's wide open right now. This applies to both
62 * number of requests and data volume. 62 * number of requests and data volume.
63 * 63 *
64 * Linden puts all kinds of header fields in the requests. 64 * Linden puts all kinds of header fields in the requests.
@@ -77,7 +77,7 @@ using System.Collections;
77 * HTTPS support 77 * HTTPS support
78 * 78 *
79 * Configurable timeout? 79 * Configurable timeout?
80 * Configurable max repsonse size? 80 * Configurable max response size?
81 * Configurable 81 * Configurable
82 * 82 *
83 * **************************************************/ 83 * **************************************************/
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a5eeaad..b27aa07 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1552,7 +1552,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1552 public void llSetForce(LSL_Types.Vector3 force, int local) 1552 public void llSetForce(LSL_Types.Vector3 force, int local)
1553 { 1553 {
1554 m_host.AddScriptLPS(1); 1554 m_host.AddScriptLPS(1);
1555 //NotImplemented("llSetForce");
1556 1555
1557 if (m_host.ParentGroup != null) 1556 if (m_host.ParentGroup != null)
1558 { 1557 {
@@ -1571,8 +1570,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1571 LSL_Types.Vector3 force = new LSL_Types.Vector3(0.0, 0.0, 0.0); 1570 LSL_Types.Vector3 force = new LSL_Types.Vector3(0.0, 0.0, 0.0);
1572 1571
1573 m_host.AddScriptLPS(1); 1572 m_host.AddScriptLPS(1);
1574 //NotImplemented("llGetForce");
1575 //return new LSL_Types.Vector3();
1576 1573
1577 if (m_host.ParentGroup != null) 1574 if (m_host.ParentGroup != null)
1578 { 1575 {
@@ -1592,7 +1589,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1592 { 1589 {
1593 m_host.AddScriptLPS(1); 1590 m_host.AddScriptLPS(1);
1594 return m_host.registerTargetWaypoint(new Vector3((float)position.x, (float)position.y, (float)position.z), (float)range); 1591 return m_host.registerTargetWaypoint(new Vector3((float)position.x, (float)position.y, (float)position.z), (float)range);
1595
1596 } 1592 }
1597 1593
1598 public void llTargetRemove(int number) 1594 public void llTargetRemove(int number)
@@ -3566,11 +3562,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3566 z = rot.z / s; 3562 z = rot.z / s;
3567 } 3563 }
3568 3564
3569
3570 return new LSL_Types.Vector3(x,y,z); 3565 return new LSL_Types.Vector3(x,y,z);
3571
3572
3573// NotImplemented("llRot2Axis");
3574 } 3566 }
3575 3567
3576 3568
@@ -3588,14 +3580,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3588 rot.y /= length; 3580 rot.y /= length;
3589 rot.z /= length; 3581 rot.z /= length;
3590 rot.s /= length; 3582 rot.s /= length;
3591
3592 } 3583 }
3593 3584
3594 double angle = 2 * Math.Acos(rot.s); 3585 double angle = 2 * Math.Acos(rot.s);
3595 3586
3596 return angle; 3587 return angle;
3597
3598// NotImplemented("llRot2Angle");
3599 } 3588 }
3600 3589
3601 public LSL_Types.LSLFloat llAcos(double val) 3590 public LSL_Types.LSLFloat llAcos(double val)
@@ -3615,7 +3604,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3615 { 3604 {
3616 m_host.AddScriptLPS(1); 3605 m_host.AddScriptLPS(1);
3617 3606
3618 return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2; 3607 return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2;
3619 } 3608 }
3620 3609
3621 public LSL_Types.LSLString llGetInventoryKey(string name) 3610 public LSL_Types.LSLString llGetInventoryKey(string name)
@@ -4594,8 +4583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4594 public LSL_Types.LSLInteger llGetFreeMemory() 4583 public LSL_Types.LSLInteger llGetFreeMemory()
4595 { 4584 {
4596 m_host.AddScriptLPS(1); 4585 m_host.AddScriptLPS(1);
4597// NotImplemented("llGetFreeMemory"); 4586 // Make scripts designed for LSO happy
4598 // Make scripts desined for LSO happy
4599 return 16384; 4587 return 16384;
4600 } 4588 }
4601 4589
@@ -7146,8 +7134,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7146 7134
7147 } 7135 }
7148 // ScriptSleep(2000); 7136 // ScriptSleep(2000);
7149
7150 //NotImplemented("llParcelMediaCommandList");
7151 } 7137 }
7152 7138
7153 public LSL_Types.list llParcelMediaQuery(LSL_Types.list aList) 7139 public LSL_Types.list llParcelMediaQuery(LSL_Types.list aList)
@@ -7876,8 +7862,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7876 llShout(ScriptBaseClass.DEBUG_CHANNEL, msg); 7862 llShout(ScriptBaseClass.DEBUG_CHANNEL, msg);
7877 } 7863 }
7878 7864
7879
7880
7881 internal void NotImplemented(string command) 7865 internal void NotImplemented(string command)
7882 { 7866 {
7883 if (throwErrorOnNotImplemented) 7867 if (throwErrorOnNotImplemented)