From 12bba3da4bb74ac3727763d2bda3fb3eadd4159b Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 23 Apr 2008 23:55:02 +0000
Subject: * Fixed an annoying pop-up box when crossing borders.

---
 .../Region/Environment/Modules/BetaGridLikeMoneyModule.cs    | 12 ++++++++++--
 OpenSim/Region/Environment/Scenes/Scene.cs                   |  2 +-
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs         |  4 ++--
 .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs             |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index 8e14ec5..bd0660f 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -258,10 +258,18 @@ namespace OpenSim.Region.Environment.Modules
                 }
                 else
                 {
+                    bool childYN = true;
+                    ScenePresence agent = null;
                     //client.SecureSessionId;
-                    Scene s = GetRandomScene();
+                    Scene s = LocateSceneClientIn(client.AgentId);
                     if (s != null)
                     {
+                        agent = s.GetScenePresence(client.AgentId);
+                        if (agent != null)
+                            childYN = agent.IsChildAgent;
+                    }
+                    if (s != null && agent != null && childYN == false)
+                    {
                         //s.RegionInfo.RegionHandle;
                         LLUUID agentID = LLUUID.Zero;
                         int funds = 0;
@@ -846,7 +854,7 @@ namespace OpenSim.Region.Environment.Modules
                 }
                 else
                 {
-                    throw new Exception("Unable to get funds.");
+                    //throw new Exception("Unable to get funds.");
                 }
             }
             return returnfunds;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fd729d6..c41a445 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2792,7 +2792,7 @@ namespace OpenSim.Region.Environment.Scenes
                         {
                             return false;
                         }
-                    }
+                    } 
                     else
                     {
                         if (part.OwnerID == parcel.landData.ownerID)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index ba851fc..e2cb3ac 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -650,7 +650,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         #endregion
-
+         
         public LLUUID ObjectOwner
         {
             get { return OwnerID; }
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             return newobject;
         }
-
+         
         public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim)
         {
 
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 05838cc..50bc892 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -362,7 +362,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
 
                 // Returns text of state entry match, 
                 scriptCopy += eventmatches[pos]; pos++;
-                
+                 
                 // Returns which state we're matching and writes a method call to the end of the above state_entry
                 scriptCopy += "\r\n\t\tosSetStateEvents((int)" + (int)state_events[eventmatches[pos]] + ");"; //pos++;
                 
@@ -406,7 +406,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
             unUsedStates.Clear();
             state_events.Clear();
             quotes.Clear();
-
+             
             return Return;
         }
         public scriptEvents convertnametoFlag(string eventname)
-- 
cgit v1.1