diff options
author | Melanie | 2011-12-08 03:24:25 +0000 |
---|---|---|
committer | Melanie | 2011-12-08 03:24:25 +0000 |
commit | 50aa89dae66246395e9aac4d7d31f010e55473e8 (patch) | |
tree | b2d23662cc5a51e13f582728bf7064077f9edc32 /bin/OpenMetaverse.StructuredData.dll | |
parent | Fix intersim object give messages (diff) | |
parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
download | opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC_OLD-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rwxr-xr-x | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index ed0a2d6..aa05418 100755 --- a/bin/OpenMetaverse.StructuredData.dll +++ b/bin/OpenMetaverse.StructuredData.dll | |||
Binary files differ | |||