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

Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs

2012-01-06 00:08:18 +00:00

..

Appearance

Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request

2012-01-05 19:40:54 +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

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

XmlRpcGroups

Merge branch 'master' into careminster

2011-12-19 23:16:20 +00:00