diff options
author | Melanie | 2013-05-11 02:35:26 +0100 |
---|---|---|
committer | Melanie | 2013-05-11 02:35:26 +0100 |
commit | 13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch) | |
tree | 41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2 opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Console/LocalConsole.cs | 15 | ||||
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index d41481f..a967db6 100644 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs | |||
@@ -426,6 +426,21 @@ namespace OpenSim.Framework.Console | |||
426 | System.Console.Write("{0}", prompt); | 426 | System.Console.Write("{0}", prompt); |
427 | 427 | ||
428 | break; | 428 | break; |
429 | case ConsoleKey.Delete: | ||
430 | if (m_cursorXPosition == m_commandLine.Length) | ||
431 | break; | ||
432 | |||
433 | m_commandLine.Remove(m_cursorXPosition, 1); | ||
434 | |||
435 | SetCursorLeft(0); | ||
436 | m_cursorYPosition = SetCursorTop(m_cursorYPosition); | ||
437 | |||
438 | if (m_echo) | ||
439 | System.Console.Write("{0}{1} ", prompt, m_commandLine); | ||
440 | else | ||
441 | System.Console.Write("{0}", prompt); | ||
442 | |||
443 | break; | ||
429 | case ConsoleKey.End: | 444 | case ConsoleKey.End: |
430 | m_cursorXPosition = m_commandLine.Length; | 445 | m_cursorXPosition = m_commandLine.Length; |
431 | break; | 446 | break; |
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index e03750b..5ddbd61 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -430,6 +430,5 @@ namespace OpenSim.Framework | |||
430 | { | 430 | { |
431 | return l_EstateGroups.Contains(groupID); | 431 | return l_EstateGroups.Contains(groupID); |
432 | } | 432 | } |
433 | |||
434 | } | 433 | } |
435 | } | 434 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 9631a46..34c240a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1109,9 +1109,8 @@ namespace OpenSim.Framework | |||
1109 | /// <summary> | 1109 | /// <summary> |
1110 | /// Tell the client that an object has been deleted | 1110 | /// Tell the client that an object has been deleted |
1111 | /// </summary> | 1111 | /// </summary> |
1112 | /// <param name="regionHandle"></param> | ||
1113 | /// <param name="localID"></param> | 1112 | /// <param name="localID"></param> |
1114 | void SendKillObject(ulong regionHandle, List<uint> localID); | 1113 | void SendKillObject(List<uint> localID); |
1115 | 1114 | ||
1116 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); | 1115 | void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); |
1117 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); | 1116 | void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); |