opensim/OpenSim/Region at 8fac7c065088d9861ba2ff772fde7f2e9c8d1003 - opensim - 潇潇家园的Git仓库

ogb912/opensim

mirror of https://github.com/opensim/opensim.git synced 2026-05-21 16:05:39 +08:00

Files

History

Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs

2011-10-11 21:28:23 +01:00

..

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00

Eliminate pointless checks of SOG.RootPart != null

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

Examples/SimpleModule

Resolve merge commits, stage 1

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

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00

OptionalModules

Bring us up to date.

2011-09-14 19:11:32 -07:00

Resolve merge commits, stage 1

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

RegionCombinerModule

Merge branch 'master' into careminster-presence-refactor

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

ReplaceableModules

Some module reshuffling, no user functionality yet

2009-07-10 20:46:16 +00:00

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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

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

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