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

Conflicts:
	OpenSim/Framework/Client/IClientInventory.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs

2012-03-28 02:20:40 +01:00

..

Appearance

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

Chat

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Concierge

Rename ForEachAvatar back to ForEachScenePresence. The other changes

2011-11-03 17:53:51 -07:00

Voice

Merge branch 'master' into careminster

2012-03-28 02:20:40 +01:00

XmlRpcGroups

Merge branch 'master' into careminster

2012-03-27 23:14:43 +01:00