Melanie afca742392 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2011-11-14 20:03:47 +00:00

..

AgentAssetsTransactions.cs

minor: remove some mono compiler warnings

2011-11-14 18:16:14 +00:00

AssetTransactionModule.cs

Fix avatar parameter updating for viewer 3 and maybe 2.

2011-09-23 02:59:33 +01:00

AssetXferUploader.cs

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00