ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-11-18 19:06:09 +00:00
parent f3e4000a55 8f1a79420b
commit 164007dd00
6 changed files with 212 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Console/LocalConsole.cs
View File

@@ -473,9 +473,11 @@ namespace OpenSim.Framework.Console
y = -1;
}
string commandLine = cmdline.ToString();
if (isCommand)
{
string[] cmd = Commands.Resolve(Parser.Parse(cmdline.ToString()));
string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
if (cmd.Length != 0)
{
@@ -491,8 +493,11 @@ namespace OpenSim.Framework.Console
}
}
//AddToHistory(cmdline.ToString());
return cmdline.ToString();
// If we're not echoing to screen (e.g. a password) then we probably don't want it in history
if (echo && commandLine != "")
AddToHistory(commandLine);
return commandLine;
default:
break;
}

8
OpenSim/Framework/Util.cs
View File

@@ -451,6 +451,14 @@ namespace OpenSim.Framework
return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
}
/// <summary>
/// Are the co-ordinates of the new region visible from the old region?
/// </summary>
/// <param name="oldx">Old region x-coord</param>
/// <param name="newx">New region x-coord</param>
/// <param name="oldy">Old region y-coord</param>
/// <param name="newy">New region y-coord</param>
/// <returns></returns>
public static bool IsOutsideView(uint oldx, uint newx, uint oldy, uint newy)
{
// Eventually this will be a function of the draw distance / camera position too.