diff options
author | Teravus Ovares | 2008-04-23 23:55:02 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-23 23:55:02 +0000 |
commit | 12bba3da4bb74ac3727763d2bda3fb3eadd4159b (patch) | |
tree | 1f6c64b01c033acafd444e83069154cf3bf7b5a3 /OpenSim/Region/Environment/Modules | |
parent | * Patch from Melanie. Mantis 0001037: Add various internal plumbing to the... (diff) | |
download | opensim-SC_OLD-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.zip opensim-SC_OLD-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.tar.gz opensim-SC_OLD-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.tar.bz2 opensim-SC_OLD-12bba3da4bb74ac3727763d2bda3fb3eadd4159b.tar.xz |
* Fixed an annoying pop-up box when crossing borders.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs | 12 |
1 files changed, 10 insertions, 2 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; |