2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7c1e841..ecb41e4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-01-08  McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * linden/indra/newview/llmaniptranslate.h:
+        Added openal32.dll and alut.dll to CopyWinLibs.cmake.
+
+
+2009-01-08  McCabe Maxsted  <hakushakukun@gmail.com>
+
         * linden/indra/cmake/CopyWinLibs.cmake:
         Added openal32.dll and alut.dll to CopyWinLibs.cmake.
         * linden/indra/newview/viewer_manifest.py:
diff --git a/linden/indra/newview/llmaniptranslate.h b/linden/indra/newview/llmaniptranslate.h
index 7784860..383f4da 100644
--- a/linden/indra/newview/llmaniptranslate.h
+++ b/linden/indra/newview/llmaniptranslate.h
@@ -113,7 +113,7 @@ private:
         LLVector3d      mDragCursorStartGlobal;
         LLVector3d      mDragSelectionStartGlobal;
         LLTimer         mUpdateTimer;
-        typedef std::set<ManipulatorHandle*, compare_manipulators> minpulator_list_t;
+        typedef std::multiset<ManipulatorHandle*, compare_manipulators> minpulator_list_t;
         minpulator_list_t mProjectedManipulators;
         LLVector4       mManipulatorVertices[18];
         F32                     mSnapOffsetMeters;