Melanie b3e99a4d48 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs		2012-11-08 04:51:00 +00:00
..
Application	Merge branch 'master' into careminster	2012-10-30 01:02:20 +00:00
ClientStack	Merge branch 'master' into careminster	2012-10-31 21:42:06 +00:00
CoreModules	To keep things consistent allowing an UnregisterModuleInterface... Force the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency.	2012-11-06 19:03:41 -05:00
DataSnapshot	minor: resolve some mono compiler warnings	2012-05-03 01:56:24 +01:00
Framework	Add a method to query all registered script constants to allow non-XEngine	2012-11-04 22:39:15 +00:00
OptionalModules	Add a method to query all registered script constants to allow non-XEngine	2012-11-04 22:01:34 +01:00
Physics	Merge branch 'master' into careminster	2012-11-08 04:51:00 +00:00
RegionCombinerModule	Changed "course" to "coarse" in several places	2012-10-25 23:32:37 +01:00
ReplaceableModules	…
ScriptEngine	Merge branch 'master' into careminster	2012-10-31 21:42:06 +00:00
UserStatistics	refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents	2012-10-06 04:06:27 +01:00