aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.Rendering.Meshmerizer.dll
diff options
context:
space:
mode:
authorMelanie2013-05-16 21:59:14 +0100
committerMelanie2013-05-16 21:59:14 +0100
commit42c82b564ea0fe58376bffae2731bcedf4b842c7 (patch)
tree7ed5d564f320c1dcf6b709a1436b584a59e74a5e /bin/OpenMetaverse.Rendering.Meshmerizer.dll
parentMerge branch 'master' into careminster (diff)
parentminor: remove long commented out scene cache clearing code in EntityTransferM... (diff)
downloadopensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.zip
opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.gz
opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.bz2
opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to '')
-rwxr-xr-xbin/OpenMetaverse.Rendering.Meshmerizer.dllbin24576 -> 24576 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 30b9c7b..100916c 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files differ