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

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

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

..

AgentAssetsTransactions.cs

minor: remove some mono compiler warnings

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

AssetTransactionModule.cs

User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.

2012-03-27 22:09:58 +02:00

AssetXferUploader.cs

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

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