Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor ...

This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.

2010-01-16 00:05:08 +00:00

..

Application

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

ClientStack

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

CoreModules

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

DataSnapshot

OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.

2010-01-11 07:51:33 -08:00

Examples/SimpleModule

Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users

2010-01-09 14:17:44 +00:00

Framework

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

OptionalModules

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

Physics

Formatting cleanup. Add copyright headers.

2010-01-04 06:17:30 +09:00

RegionCombinerModule

* Attempts to resolve the megaregion terrain edit rebound.

2009-12-29 21:59:19 -05:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

UserStatistics

Experimental change to use an immutable array for iterating ScenePresences, avoiding locking and copying the list each time it is accessed

2009-10-23 01:02:36 -07:00