Melanie 3a495ccd56 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2013-01-10 01:38:03 +00:00

..

BunchOfCaps

Merge branch 'master' into careminster

2013-01-10 01:38:03 +00:00

EventQueue

Merge branch 'master' into careminster

2012-11-25 14:13:50 +00:00

ObjectCaps

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Properties

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

FetchInventory2Module.cs

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

GetMeshModule.cs

Prevent a failed user relogi from throwing exceptions in poll services

2012-12-14 03:35:55 +01:00

GetTextureModule.cs

Prevent a failed user relogi from throwing exceptions in poll services

2012-12-14 03:35:55 +01:00

MeshUploadFlagModule.cs

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

RegionConsoleModule.cs

Revert "Merge master into teravuswork", it should have been avination, not master.

2012-11-15 10:05:16 -05:00

SimulatorFeaturesModule.cs

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

UploadBakedTextureModule.cs

* Fixed a bug that replayed old cached appearance when changing outfits

2012-12-31 23:04:28 -05:00

WebFetchInvDescModule.cs

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00