Melanie b975cbcbed Merge branch 'master' into bigmerge ... Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2011-10-27 18:14:38 +01:00
..
RegionCombinerClientEventForwarder.cs	* Update namespace in the regioncombinermodule.	2009-11-10 23:43:18 -05:00
RegionCombinerIndividualEventForwarder.cs	Formatting cleanup.	2010-09-12 13:43:49 -04:00
RegionCombinerLargeLandChannel.cs	remove now unused individual LandData prim counts.	2011-04-05 21:25:54 +01:00
RegionCombinerModule.cs	Merge branch 'master' into bigmerge	2011-10-27 18:14:38 +01:00
RegionCombinerPermissionModule.cs	Revamp the viewer -> banlist packet processing so fix a number of bugs.	2010-12-13 20:35:56 +00:00
RegionConnections.cs	* Update namespace in the regioncombinermodule.	2009-11-10 23:43:18 -05:00
RegionCourseLocation.cs	* Update namespace in the regioncombinermodule.	2009-11-10 23:43:18 -05:00
RegionData.cs	* Update namespace in the regioncombinermodule.	2009-11-10 23:43:18 -05:00