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

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2012-03-21 00:26:02 +00:00

..

Application

Merge branch 'master' into careminster

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

ClientStack

Merge branch 'master' into careminster

2012-03-20 23:39:02 +00:00

CoreModules

Merge branch 'master' into careminster

2012-03-21 00:26:02 +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

Add ability to log warn if a frame takes longer than twice the expected time. Currently commented out.

2012-03-21 00:02:08 +00:00

OptionalModules

Merge branch 'master' into careminster

2012-03-20 23:39:02 +00:00

Physics

let convex be a parameter to createMesh so it can be used. Was forced to add it also to original mesher code and zeromesher

2012-03-21 00:02:41 +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