aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2012-06-28 10:57:47 +0100
committerUbitUmarov2012-06-28 10:57:47 +0100
commitde10a16546029663cd5df12db615582b7a50831d (patch)
tree5d1eb9e38269902a39f9671e2f11b1b639839bb8 /OpenSim/Region
parent fix a seg fault in sp.cs (diff)
parentComment out a spammy message that will spew 4 lines for each request to a (diff)
downloadopensim-SC-de10a16546029663cd5df12db615582b7a50831d.zip
opensim-SC-de10a16546029663cd5df12db615582b7a50831d.tar.gz
opensim-SC-de10a16546029663cd5df12db615582b7a50831d.tar.bz2
opensim-SC-de10a16546029663cd5df12db615582b7a50831d.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs2
3 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index f4cf6b4..a701b46 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -508,7 +508,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
508 } 508 }
509 else 509 else
510 { 510 {
511 m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString()); 511 //m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString());
512 return;
512 } 513 }
513 514
514 //for llGetHttpHeader support we need to store original URI here 515 //for llGetHttpHeader support we need to store original URI here
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 05adf8e..75add29 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12416,9 +12416,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12416 12416
12417 ContactResult result = new ContactResult (); 12417 ContactResult result = new ContactResult ();
12418 result.ConsumerID = group.LocalId; 12418 result.ConsumerID = group.LocalId;
12419 result.Depth = intersection.distance; 12419// result.Depth = intersection.distance;
12420 result.Normal = intersection.normal; 12420 result.Normal = intersection.normal;
12421 result.Pos = intersection.ipoint; 12421 result.Pos = intersection.ipoint;
12422 result.Depth = Vector3.Mag(rayStart - result.Pos);
12422 12423
12423 contacts.Add(result); 12424 contacts.Add(result);
12424 }); 12425 });
@@ -12613,7 +12614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12613 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); 12614 bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL);
12614 12615
12615 12616
12616 if (World.SuportsRayCastFiltered()) 12617 if (false)// World.SuportsRayCastFiltered())
12617 { 12618 {
12618 if (dist == 0) 12619 if (dist == 0)
12619 return list; 12620 return list;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 278f74e..ad4f70c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -667,7 +667,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
667 667
668 public static readonly LSLInteger RCERR_UNKNOWN = -1; 668 public static readonly LSLInteger RCERR_UNKNOWN = -1;
669 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2; 669 public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
670 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3; 670 public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3;
671 671
672 public const int KFM_MODE = 1; 672 public const int KFM_MODE = 1;
673 public const int KFM_LOOP = 1; 673 public const int KFM_LOOP = 1;