Melanie 5768a151ff Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs

2012-03-20 02:48:11 +00:00

..

Application

Merge branch 'master' into careminster

2012-03-18 20:44:56 +00:00

ClientStack

Remove debug output using Console.WriteLine and trim excessive whitespace

2012-03-19 14:39:19 +01:00

CoreModules

Merge branch 'master' into careminster

2012-03-20 02:48:11 +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 branch 'master' into careminster

2012-03-20 02:48:11 +00:00

OptionalModules

Merge branch 'master' into careminster

2012-03-18 20:44:56 +00:00

Physics

Merge branch 'master' into careminster

2012-03-20 02:48:11 +00:00

RegionCombinerModule

Merge branch 'master' into careminster

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

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2012-03-20 02:48:11 +00:00

UserStatistics

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

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