Melanie d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

2011-10-11 23:14:23 +01:00

..

Application

Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge

2011-10-11 23:02:19 +01:00

ClientStack

Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge

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

CoreModules

Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

2011-10-11 23:14:23 +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 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge

2011-10-11 23:08:18 +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 '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge

2011-10-11 23:08:38 +01:00

UserStatistics

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

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