Merge branch 'master' into bigmerge

Browse Source

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

avinationmerge

Melanie 2011-11-11 01:19:38 +00:00

parent d15d5bf181 7432ca6daf

commit a9fbf3a4e0

1 changed files with 236 additions and 247 deletions

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

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

483

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

View File

File diff suppressed because it is too large Load Diff