OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed an annoying pop-up box when crossing borders.

0.6.0-stable
Teravus Ovares 2008-04-23 23:55:02 +00:00
parent 1909d74d5f
commit 12bba3da4b
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -235,7 +235,7 @@ namespace OpenSim.Framework.Console
{ {
} }
} }
public string ReadLine() public string ReadLine()
{ {
try try
@ -248,7 +248,7 @@ namespace OpenSim.Framework.Console
return String.Empty; return String.Empty;
} }
} }
public int Read() public int Read()
{ {
return System.Console.Read(); return System.Console.Read();

12
OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
View File

@ -258,9 +258,17 @@ namespace OpenSim.Region.Environment.Modules
} }
else else
{ {
bool childYN = true;
ScenePresence agent = null;
//client.SecureSessionId; //client.SecureSessionId;
Scene s = GetRandomScene(); Scene s = LocateSceneClientIn(client.AgentId);
if (s != null) if (s != null)
{
agent = s.GetScenePresence(client.AgentId);
if (agent != null)
childYN = agent.IsChildAgent;
}
if (s != null && agent != null && childYN == false)
{ {
//s.RegionInfo.RegionHandle; //s.RegionInfo.RegionHandle;
LLUUID agentID = LLUUID.Zero; LLUUID agentID = LLUUID.Zero;
@ -846,7 +854,7 @@ namespace OpenSim.Region.Environment.Modules
} }
else else
{ {
throw new Exception("Unable to get funds."); //throw new Exception("Unable to get funds.");
} }
} }
return returnfunds; return returnfunds;

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2792,7 +2792,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
return false; return false;
} }
} }
else else
{ {
if (part.OwnerID == parcel.landData.ownerID) if (part.OwnerID == parcel.landData.ownerID)

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -650,7 +650,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
#endregion #endregion
public LLUUID ObjectOwner public LLUUID ObjectOwner
{ {
get { return OwnerID; } get { return OwnerID; }
@ -797,7 +797,7 @@ namespace OpenSim.Region.Environment.Scenes
return newobject; return newobject;
} }
public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim) public void ApplyPhysics(uint rootObjectFlags, bool m_physicalPrim)
{ {

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
View File

@ -362,7 +362,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
// Returns text of state entry match, // Returns text of state entry match,
scriptCopy += eventmatches[pos]; pos++; scriptCopy += eventmatches[pos]; pos++;
// Returns which state we're matching and writes a method call to the end of the above state_entry // 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++; 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(); unUsedStates.Clear();
state_events.Clear(); state_events.Clear();
quotes.Clear(); quotes.Clear();
return Return; return Return;
} }
public scriptEvents convertnametoFlag(string eventname) public scriptEvents convertnametoFlag(string eventname)