aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 44f9c1a..16fe6f9 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -380,7 +380,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
380 XmlRpcResponse response = new XmlRpcResponse(); 380 XmlRpcResponse response = new XmlRpcResponse();
381 Hashtable responseData = new Hashtable(); 381 Hashtable responseData = new Hashtable();
382 382
383 lock(this) { 383 lock (this) {
384 int m_regionLimit = m_config.GetInt("region_limit", 0); 384 int m_regionLimit = m_config.GetInt("region_limit", 0);
385 385
386 try { 386 try {
@@ -574,7 +574,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
574 XmlRpcResponse response = new XmlRpcResponse(); 574 XmlRpcResponse response = new XmlRpcResponse();
575 Hashtable responseData = new Hashtable(); 575 Hashtable responseData = new Hashtable();
576 576
577 lock(this) { 577 lock (this) {
578 try { 578 try {
579 Hashtable requestData = (Hashtable) request.Params[0]; 579 Hashtable requestData = (Hashtable) request.Params[0];
580 checkStringParameters(request, new string[] {"password", "region_name"}); 580 checkStringParameters(request, new string[] {"password", "region_name"});
@@ -649,7 +649,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
649 XmlRpcResponse response = new XmlRpcResponse(); 649 XmlRpcResponse response = new XmlRpcResponse();
650 Hashtable responseData = new Hashtable(); 650 Hashtable responseData = new Hashtable();
651 651
652 lock(this) { 652 lock (this) {
653 try 653 try
654 { 654 {
655 Hashtable requestData = (Hashtable) request.Params[0]; 655 Hashtable requestData = (Hashtable) request.Params[0];
@@ -749,7 +749,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
749 XmlRpcResponse response = new XmlRpcResponse(); 749 XmlRpcResponse response = new XmlRpcResponse();
750 Hashtable responseData = new Hashtable(); 750 Hashtable responseData = new Hashtable();
751 751
752 lock(this) { 752 lock (this) {
753 try 753 try
754 { 754 {
755 Hashtable requestData = (Hashtable)request.Params[0]; 755 Hashtable requestData = (Hashtable)request.Params[0];
@@ -917,7 +917,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
917 XmlRpcResponse response = new XmlRpcResponse(); 917 XmlRpcResponse response = new XmlRpcResponse();
918 Hashtable responseData = new Hashtable(); 918 Hashtable responseData = new Hashtable();
919 919
920 lock(this) { 920 lock (this) {
921 try 921 try
922 { 922 {
923 Hashtable requestData = (Hashtable) request.Params[0]; 923 Hashtable requestData = (Hashtable) request.Params[0];
@@ -1043,7 +1043,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1043 XmlRpcResponse response = new XmlRpcResponse(); 1043 XmlRpcResponse response = new XmlRpcResponse();
1044 Hashtable responseData = new Hashtable(); 1044 Hashtable responseData = new Hashtable();
1045 1045
1046 lock(this) { 1046 lock (this) {
1047 try 1047 try
1048 { 1048 {
1049 Hashtable requestData = (Hashtable) request.Params[0]; 1049 Hashtable requestData = (Hashtable) request.Params[0];
@@ -1194,7 +1194,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1194 XmlRpcResponse response = new XmlRpcResponse(); 1194 XmlRpcResponse response = new XmlRpcResponse();
1195 Hashtable responseData = new Hashtable(); 1195 Hashtable responseData = new Hashtable();
1196 1196
1197 lock(this) { 1197 lock (this) {
1198 1198
1199 try 1199 try
1200 { 1200 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 52e7288..7a7c8d6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3029,9 +3029,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3029 return; 3029 return;
3030 } 3030 }
3031 IClientAPI client = null; 3031 IClientAPI client = null;
3032 ScenePresence sp = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); 3032 ScenePresence sp = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter);
3033 if (sp!=null) 3033 if (sp != null)
3034 client = sp.ControllingClient; 3034 client = sp.ControllingClient;
3035 SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)target); 3035 SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)target);
3036 if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0) 3036 if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0)
3037 return; // Fail silently if attached 3037 return; // Fail silently if attached