ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

Browse Source
This commit is contained in:
Melanie
2013-05-11 01:29:30 +01:00
parent 81d8deb1a8 a42bb799cc
commit 55c9bc15e5
24 changed files with 191 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,6 +420,21 @@ namespace OpenSim.Framework.Console
SetCursorLeft(0);
m_cursorYPosition = SetCursorTop(m_cursorYPosition);
if (m_echo)
System.Console.Write("{0}{1} ", prompt, m_commandLine);
else
System.Console.Write("{0}", prompt);
break;
case ConsoleKey.Delete:
if (m_cursorXPosition == m_commandLine.Length)
break;
m_commandLine.Remove(m_cursorXPosition, 1);
SetCursorLeft(0);
m_cursorYPosition = SetCursorTop(m_cursorYPosition);
if (m_echo)
System.Console.Write("{0}{1} ", prompt, m_commandLine);
else

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -1097,9 +1097,8 @@ namespace OpenSim.Framework
/// <summary>
/// Tell the client that an object has been deleted
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="localID"></param>
void SendKillObject(ulong regionHandle, List<uint> localID);
void SendKillObject(List<uint> localID);
void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);