diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 4 |
3 files changed, 13 insertions, 5 deletions
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 | |||
258 | } | 258 | } |
259 | else | 259 | else |
260 | { | 260 | { |
261 | bool childYN = true; | ||
262 | ScenePresence agent = null; | ||
261 | //client.SecureSessionId; | 263 | //client.SecureSessionId; |
262 | Scene s = GetRandomScene(); | 264 | Scene s = LocateSceneClientIn(client.AgentId); |
263 | if (s != null) | 265 | if (s != null) |
264 | { | 266 | { |
267 | agent = s.GetScenePresence(client.AgentId); | ||
268 | if (agent != null) | ||
269 | childYN = agent.IsChildAgent; | ||
270 | } | ||
271 | if (s != null && agent != null && childYN == false) | ||
272 | { | ||
265 | //s.RegionInfo.RegionHandle; | 273 | //s.RegionInfo.RegionHandle; |
266 | LLUUID agentID = LLUUID.Zero; | 274 | LLUUID agentID = LLUUID.Zero; |
267 | int funds = 0; | 275 | int funds = 0; |
@@ -846,7 +854,7 @@ namespace OpenSim.Region.Environment.Modules | |||
846 | } | 854 | } |
847 | else | 855 | else |
848 | { | 856 | { |
849 | throw new Exception("Unable to get funds."); | 857 | //throw new Exception("Unable to get funds."); |
850 | } | 858 | } |
851 | } | 859 | } |
852 | return returnfunds; | 860 | 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 | |||
2792 | { | 2792 | { |
2793 | return false; | 2793 | return false; |
2794 | } | 2794 | } |
2795 | } | 2795 | } |
2796 | else | 2796 | else |
2797 | { | 2797 | { |
2798 | if (part.OwnerID == parcel.landData.ownerID) | 2798 | 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 | |||
650 | } | 650 | } |
651 | 651 | ||
652 | #endregion | 652 | #endregion |
653 | 653 | ||
654 | public LLUUID ObjectOwner | 654 | public LLUUID ObjectOwner |
655 | { | 655 | { |
656 | get { return OwnerID; } | 656 | get { return OwnerID; } |
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
797 | 797 | ||
798 | return newobject; | 798 | return newobject; |
799 | } | 799 | } |
800 | 800 | ||
801 | public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim) | 801 | public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim) |
802 | { | 802 | { |
803 | 803 | ||