Merge branch 'master' into careminster-presence-refactor

Browse Source

This brings careminster on the level of master. To be tested

...

This commit is contained in:

Melanie

2010-03-03 02:07:03 +00:00

parent 01c4bb4a5e 14073831d2

commit 028a87fe37

501 changed files with 26121 additions and 46964 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1229

OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

File diff suppressed because it is too large Load Diff