aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJeff Ames2009-08-09 00:43:13 +0900
committerJeff Ames2009-08-09 00:43:13 +0900
commitbc6ec3b56469f2d722ceee8fdb37059125878f66 (patch)
tree760639b0847b0dfe818989b5adc4f7cf87c0dbab /OpenSim/Region/ScriptEngine
parent* Fix one physics crash for regions larger then 512mx512m (diff)
downloadopensim-SC_OLD-bc6ec3b56469f2d722ceee8fdb37059125878f66.zip
opensim-SC_OLD-bc6ec3b56469f2d722ceee8fdb37059125878f66.tar.gz
opensim-SC_OLD-bc6ec3b56469f2d722ceee8fdb37059125878f66.tar.bz2
opensim-SC_OLD-bc6ec3b56469f2d722ceee8fdb37059125878f66.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs6
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b855a1a..ff85b96 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7246,10 +7246,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7246 public LSL_List llGetPrimitiveParams(LSL_List rules) 7246 public LSL_List llGetPrimitiveParams(LSL_List rules)
7247 { 7247 {
7248 m_host.AddScriptLPS(1); 7248 m_host.AddScriptLPS(1);
7249 return GetLinkPrimitiveParams( m_host, rules ); 7249 return GetLinkPrimitiveParams(m_host, rules);
7250 } 7250 }
7251 7251
7252 public LSL_List GetLinkPrimitiveParams( SceneObjectPart part, LSL_List rules ) 7252 public LSL_List GetLinkPrimitiveParams(SceneObjectPart part, LSL_List rules)
7253 { 7253 {
7254 7254
7255 LSL_List res = new LSL_List(); 7255 LSL_List res = new LSL_List();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index cbe84ac..6539bda 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1748,16 +1748,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1748 // to an unscrupulous third party, thus permitting unauthorized duplication of 1748 // to an unscrupulous third party, thus permitting unauthorized duplication of
1749 // the object's form. 1749 // the object's form.
1750 // 1750 //
1751 public LSL_List osGetLinkPrimitiveParams( int linknumber, LSL_List rules ) 1751 public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules)
1752 { 1752 {
1753 CheckThreatLevel( ThreatLevel.High, "osGetLinkPrimitiveParams" ); 1753 CheckThreatLevel(ThreatLevel.High, "osGetLinkPrimitiveParams");
1754 m_host.AddScriptLPS( 1 ); 1754 m_host.AddScriptLPS(1);
1755 InitLSL(); 1755 InitLSL();
1756 LSL_List retVal = new LSL_List(); 1756 LSL_List retVal = new LSL_List();
1757 List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts( linknumber ); 1757 List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber);
1758 foreach (SceneObjectPart part in parts) 1758 foreach (SceneObjectPart part in parts)
1759 { 1759 {
1760 retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams( part, rules ); 1760 retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams(part, rules);
1761 } 1761 }
1762 return retVal; 1762 return retVal;
1763 } 1763 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 23e03e2..0be29f2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -146,8 +146,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
146 string osLoadedCreationDate(); 146 string osLoadedCreationDate();
147 string osLoadedCreationTime(); 147 string osLoadedCreationTime();
148 string osLoadedCreationID(); 148 string osLoadedCreationID();
149 149
150 LSL_List osGetLinkPrimitiveParams( int linknumber, LSL_List rules ); 150 LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
151 151
152 } 152 }
153} 153}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 22c8887..abdba05 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -387,10 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
387 { 387 {
388 return m_OSSL_Functions.osLoadedCreationID(); 388 return m_OSSL_Functions.osLoadedCreationID();
389 } 389 }
390 390
391 public LSL_List osGetLinkPrimitiveParams( int linknumber, LSL_List rules ) 391 public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules)
392 { 392 {
393 return m_OSSL_Functions.osGetLinkPrimitiveParams( linknumber, rules ); 393 return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules);
394 } 394 }
395 395
396 396