Melanie ed67b698d3 Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-03-22 23:05:58 +00:00

..

Application

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00

ClientStack

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00

CoreModules

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

2012-03-22 23:05:58 +00:00

DataSnapshot

Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.

2012-03-13 08:06:30 -07:00

Framework

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

2012-03-22 23:05:58 +00:00

OptionalModules

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00

Physics

minor clean

2012-03-21 21:17:00 +00:00

RegionCombinerModule

Merge branch 'master' into careminster

2012-03-11 02:29:43 +00:00

ReplaceableModules

Some module reshuffling, no user functionality yet

2009-07-10 20:46:16 +00:00

ScriptEngine

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

2012-03-22 23:05:58 +00:00

UserStatistics

Call Dispose() via using() on SqliteCommands in WebStatsModule after use.

2012-02-28 22:54:21 +00:00