Melanie e82d4154a2 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Physics/Manager/PhysicsActor.cs
	OpenSim/Region/Physics/Manager/PhysicsScene.cs

2013-07-24 04:45:07 +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

Fixed the stats in show client stats. Also left some comments with observations about AgentUpdates.

2013-07-21 09:00:27 -07:00