Melanie 68b910c1ff Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

2013-03-22 01:01:24 +00:00

..

Application

Merge branch 'master' into careminster

2013-03-15 23:45:32 +00:00

ClientStack

Merge branch 'master' into careminster

2013-03-15 23:45:32 +00:00

CoreModules

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

DataSnapshot

Bug fix in DataSnapshot, where a var was being used before being initialized.

2013-02-28 14:20:07 -08:00

Framework

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

OptionalModules

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

Physics

Merge branch 'master' into careminster

2013-03-22 01:01:24 +00:00

RegionCombinerModule

Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()

2013-03-14 22:56:26 +00:00

ReplaceableModules

…

ScriptEngine

Merge branch 'avination' into careminster

2013-03-19 01:24:14 +00:00

UserStatistics

Deleted all AssemblyFileVersion directives

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