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

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs

2013-07-13 00:57:03 +01:00

..

Application

Merge branch 'master' into careminster

2013-07-13 00:47:58 +01:00

ClientStack

Merge branch 'master' into careminster

2013-07-13 00:57:03 +01:00

CoreModules

Merge branch 'master' into careminster

2013-07-13 00:47:58 +01:00

DataSnapshot

DataSnapshot: changed those annoying messages to Debug instead of Info.

2013-06-12 17:48:20 -07:00

Framework

Merge branch 'master' into careminster

2013-07-13 00:57:03 +01:00

OptionalModules

Merge branch 'master' into careminster

2013-07-13 00:47:58 +01:00

Physics

Merge branch 'master' into careminster

2013-07-13 00:47:58 +01:00

RegionCombinerModule

Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.

2013-04-06 02:34:51 +01:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2013-07-13 00:57:03 +01:00

UserStatistics

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00