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 | |
| parent | Fix intersim object give messages (diff) | |
| parent | Remove unused SceneManager.TryGetAvatarsScene() (diff) | |
| download | opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.zip opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.gz opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.bz2 opensim-SC-50aa89dae66246395e9aac4d7d31f010e55473e8.tar.xz | |
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/Nini.dll | bin | 55808 -> 56320 bytes |
| -rwxr-xr-x | bin/OpenMetaverse.Rendering.Meshmerizer.dll | bin | 20480 -> 24576 bytes |
| -rwxr-xr-x | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes |
| -rwxr-xr-x | bin/OpenMetaverse.dll | bin | 1736704 -> 1753088 bytes |
| -rwxr-xr-x | bin/OpenMetaverseTypes.dll | bin | 114688 -> 114688 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/bin/Nini.dll b/bin/Nini.dll index c421005..2d16d95 100755 --- a/bin/Nini.dll +++ b/bin/Nini.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index a6dec04..e0a3aa5 100755 --- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll +++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll | |||
| Binary files differ | |||
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 | |||
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index 37ec47a..523f5a7 100755 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 6f7fbac..e3356c9 100755 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
| Binary files differ | |||