aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs2
-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
9 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 582f44d..76bcd7e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -927,7 +927,7 @@ namespace OpenSim.Region.Framework.Scenes
927 { 927 {
928 foreach (IScriptModule e in engines) 928 foreach (IScriptModule e in engines)
929 { 929 {
930 if(!e.CanBeDeleted(item.ItemID)) 930 if (!e.CanBeDeleted(item.ItemID))
931 return false; 931 return false;
932 } 932 }
933 } 933 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
index b1f93e9..9ba09ed 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
53 string requestcontext = (string) request["Hunt-Context"]; 53 string requestcontext = (string) request["Hunt-Context"];
54 response["content_type"] = "text/xml"; 54 response["content_type"] = "text/xml";
55 response["keepalive"] = false; 55 response["keepalive"] = false;
56 response["int_response_code"] = 200; 56 response["int_response_code"] = 200;
57 if ( Context != String.Empty && Context != requestcontext) 57 if (Context != String.Empty && Context != requestcontext)
58 { 58 {
59 m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context"); 59 m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context");
60 response["str_response_string"] = ""; 60 response["str_response_string"] = "";
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index 8afaeea..5d90a8f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
42 { 42 {
43 Hashtable response = new Hashtable(); 43 Hashtable response = new Hashtable();
44 string domain = (string) request["domain"]; 44 string domain = (string) request["domain"];
45 if ( domain != Realm) { 45 if (domain != Realm) {
46 response["content_type"] = "text/xml"; 46 response["content_type"] = "text/xml";
47 response["keepalive"] = false; 47 response["keepalive"] = false;
48 response["int_response_code"] = 200; 48 response["int_response_code"] = 200;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index d77fe5b..115660a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -95,8 +95,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
95 { 95 {
96 // if groups aren't enabled, we're not needed. 96 // if groups aren't enabled, we're not needed.
97 // if we're not specified as the connector to use, then we're not wanted 97 // if we're not specified as the connector to use, then we're not wanted
98 if ( (groupsConfig.GetBoolean("Enabled", false) == false) 98 if ((groupsConfig.GetBoolean("Enabled", false) == false)
99 || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name)) 99 || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name))
100 { 100 {
101 m_connectorEnabled = false; 101 m_connectorEnabled = false;
102 return; 102 return;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 6a15a33..5ed9af3 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
93 93
94 void EventManager_OnStopScript(uint localID, UUID itemID) 94 void EventManager_OnStopScript(uint localID, UUID itemID)
95 { 95 {
96 if(m_scripts.ContainsKey(itemID)) 96 if (m_scripts.ContainsKey(itemID))
97 { 97 {
98 m_scripts[itemID].Stop(); 98 m_scripts[itemID].Stop();
99 } 99 }
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