Melanie 7da744566d Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-07-20 09:31:06 +01:00

..

JsonStore

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

Minimodule

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

ObjectModules

Add copyright headers.

2009-03-07 02:11:50 +00:00

RegionReadyModule

minor: remove some mono compiler warnings

2012-07-19 22:37:48 +01:00

ScriptModuleComms

make the namespace for the ScriptModuleComms consistent with its file system location

2012-04-17 13:45:03 -07:00

XmlRpcRouterModule

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00