Melanie 578174d21c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2013-02-27 18:05:04 +00:00

..

Application

Merge branch 'master' into careminster

2013-02-10 20:01:51 +00:00

ClientStack

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00

CoreModules

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

DataSnapshot

Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup]

2013-02-22 15:57:33 -08:00

Framework

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

OptionalModules

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

Physics

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

RegionCombinerModule

Deleted all AssemblyFileVersion directives

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

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

UserStatistics

Deleted all AssemblyFileVersion directives

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