Melanie 69054ad134 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

2013-10-06 18:32:20 +01:00

..

AssemblyInfo.cs

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

CommandConsole.cs

Merge branch 'master' into careminster

2013-01-10 01:38:03 +00:00

ConsoleBase.cs

factor out common HandleShow code for "show uptime"

2012-11-22 04:05:09 +00:00

ConsoleDisplayList.cs

…

ConsoleDisplayTable.cs

Fix indenting on ConsoleDisplayTable, align indenting on "show animations" console command

2013-01-02 22:37:50 +00:00

ConsolePluginCommand.cs

…

ConsoleUtil.cs

Make it possible to disconnected a specified number of bots via the pCampbot console command "disconnect [<n>]"

2013-08-19 21:00:31 +01:00

LocalConsole.cs

Implement delete key for local console

2013-05-09 23:11:37 +01:00

MockConsole.cs

factor out common HandleShow code for "show uptime"

2012-11-22 04:05:09 +00:00

OpenSimAppender.cs

…

RemoteConsole.cs

Add request received/handling stats for caps which are served by http poll handlers.

2013-07-15 23:27:46 +01:00