diff options
| author | James Cook <james@lindenlab.com> | 2009-07-14 19:06:17 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-14 19:06:17 +0000 |
| commit | 83a6ea234f32bf30d1f16b276d128debb2aeea02 (patch) | |
| tree | 0950d0cccb1effa90c1da7f479adb591f3de3d68 /indra/newview/lllistview.cpp | |
| parent | 9ecdbd8b72fec5182d2a5f843c9e4a050069ed51 (diff) | |
Merge skinning-15 to viewer-2. Fixes include:
DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly)
DEV-35143 Modal alerts appear behind side tray
DEV-35141 Landmarks image and description outside of landmarks
Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/lllistview.cpp')
| -rw-r--r-- | indra/newview/lllistview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllistview.cpp b/indra/newview/lllistview.cpp index 568655b500..3019d5d3d5 100644 --- a/indra/newview/lllistview.cpp +++ b/indra/newview/lllistview.cpp @@ -35,7 +35,7 @@ #include "lllistview.h" #include "lltextbox.h" -#include "lluictrlfactory.h" // LLDefaultWidgetRegistry +#include "lluictrlfactory.h" // LLDefaultChildRegistry // linker optimizes this out on Windows until there is a real reference // to this file |