diff options
| author | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
| commit | c0034c520c6e61b64822e276316651ec6912bd98 (patch) | |
| tree | 910442027b6a2c1406d80ca93949755b54badf5c /linden/indra/newview/llmaniptranslate.h | |
| parent | Use all those cores for compile (diff) | |
| parent | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h (diff) | |
| download | meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.zip meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.gz meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.bz2 meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.xz | |
Merge branch 'mccabe-plugins' into plugins_merge
Conflicts:
linden/doc/contributions.txt
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/LLMedia.cmake
linden/indra/cmake/OPENAL.cmake
linden/indra/llmedia/CMakeLists.txt
linden/indra/llprimitive/material_codes.h
linden/indra/newview/chatbar_as_cmdline.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
linden/indra/newview/viewer_manifest.py
linden/install.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llmaniptranslate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmaniptranslate.h b/linden/indra/newview/llmaniptranslate.h index 77f12ff..25ff35c 100644 --- a/linden/indra/newview/llmaniptranslate.h +++ b/linden/indra/newview/llmaniptranslate.h | |||
| @@ -116,7 +116,7 @@ private: | |||
| 116 | LLVector3d mDragCursorStartGlobal; | 116 | LLVector3d mDragCursorStartGlobal; |
| 117 | LLVector3d mDragSelectionStartGlobal; | 117 | LLVector3d mDragSelectionStartGlobal; |
| 118 | LLTimer mUpdateTimer; | 118 | LLTimer mUpdateTimer; |
| 119 | typedef std::multiset<ManipulatorHandle*, compare_manipulators> minpulator_list_t; | 119 | typedef std::set<ManipulatorHandle*, compare_manipulators> minpulator_list_t; |
| 120 | minpulator_list_t mProjectedManipulators; | 120 | minpulator_list_t mProjectedManipulators; |
| 121 | LLVector4 mManipulatorVertices[18]; | 121 | LLVector4 mManipulatorVertices[18]; |
| 122 | F32 mSnapOffsetMeters; | 122 | F32 mSnapOffsetMeters; |