Melanie 2f365ea80b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-09-07 13:54:19 +01:00

..

InternetRelayClientView

Merge branch 'master' into careminster

2013-07-24 04:45:07 +01:00

TextureSender

Change "help" to display categories/module list then "help <category/module>" to display commands in a category.

2012-03-08 01:51:37 +00:00

UDP/Linden

Stop "show client stats" from throwing an exception if somehow Scene.m_clientManager still retains a reference to a dead client.

2013-09-04 23:48:24 +01:00