Melanie b40157fc9b Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs

2011-10-11 22:51:44 +01:00

..

Application

Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge

2011-10-11 21:32:24 +01:00

ClientStack

Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +01:00

CoreModules

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

DataSnapshot

Eliminate pointless checks of SOG.RootPart != null

2011-09-01 02:11:00 +01:00

Examples/SimpleModule

Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +01:00

Framework

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

OptionalModules

Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +01:00

Physics

Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge

2011-10-11 22:23:16 +01:00

RegionCombinerModule

Merge branch 'master' into careminster-presence-refactor

2011-04-06 09:22:55 +01:00

ReplaceableModules

…

ScriptEngine

Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge

2011-10-11 22:11:44 +01:00

UserStatistics

Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll

2011-04-30 11:03:22 -07:00