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

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

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

..

InternetRelayClientView

Merge branch 'master' into careminster

2011-12-10 15:19:31 +00:00

TextureSender

Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure

2012-01-05 22:54:33 +00:00

UDP/Linden

Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.

2011-12-09 23:07:53 +00:00