aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-23 23:55:02 +0000
committerTeravus Ovares2008-04-23 23:55:02 +0000
commit12bba3da4bb74ac3727763d2bda3fb3eadd4159b (patch)
tree1f6c64b01c033acafd444e83069154cf3bf7b5a3
parent* Patch from Melanie. Mantis 0001037: Add various internal plumbing to the... (diff)
downloadopensim-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.
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs4
5 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index f6d8ebd..adaec4e 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Framework.Console
235 { 235 {
236 } 236 }
237 } 237 }
238 238
239 public string ReadLine() 239 public string ReadLine()
240 { 240 {
241 try 241 try
@@ -248,7 +248,7 @@ namespace OpenSim.Framework.Console
248 return String.Empty; 248 return String.Empty;
249 } 249 }
250 } 250 }
251 251
252 public int Read() 252 public int Read()
253 { 253 {
254 return System.Console.Read(); 254 return System.Console.Read();
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
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
362 362
363 // Returns text of state entry match, 363 // Returns text of state entry match,
364 scriptCopy += eventmatches[pos]; pos++; 364 scriptCopy += eventmatches[pos]; pos++;
365 365
366 // Returns which state we're matching and writes a method call to the end of the above state_entry 366 // Returns which state we're matching and writes a method call to the end of the above state_entry
367 scriptCopy += "\r\n\t\tosSetStateEvents((int)" + (int)state_events[eventmatches[pos]] + ");"; //pos++; 367 scriptCopy += "\r\n\t\tosSetStateEvents((int)" + (int)state_events[eventmatches[pos]] + ");"; //pos++;
368 368
@@ -406,7 +406,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
406 unUsedStates.Clear(); 406 unUsedStates.Clear();
407 state_events.Clear(); 407 state_events.Clear();
408 quotes.Clear(); 408 quotes.Clear();
409 409
410 return Return; 410 return Return;
411 } 411 }
412 public scriptEvents convertnametoFlag(string eventname) 412 public scriptEvents convertnametoFlag(string eventname)