summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-07-14 19:06:17 +0000
committerJames Cook <james@lindenlab.com>2009-07-14 19:06:17 +0000
commit83a6ea234f32bf30d1f16b276d128debb2aeea02 (patch)
tree0950d0cccb1effa90c1da7f479adb591f3de3d68 /indra/newview
parent9ecdbd8b72fec5182d2a5f843c9e4a050069ed51 (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')
-rw-r--r--indra/newview/llfloateruipreview.cpp8
-rw-r--r--indra/newview/lllistview.cpp2
-rw-r--r--indra/newview/lllocationhistory.cpp1
-rw-r--r--indra/newview/llpanelpicks.cpp2
-rw-r--r--indra/newview/llviewerwindow.cpp11
5 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index e7304ea5a9..599f1598cf 100644
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -77,6 +77,8 @@ std::string LLFloaterUIPreview::mSavedDiffPath = std::string("");
static const S32 PRIMARY_FLOATER = 1;
static const S32 SECONDARY_FLOATER = 2;
+static LLDefaultChildRegistry::Register<LLOverlapPanel> register_overlap_panel("overlap_panel");
+
static std::string get_xui_dir()
{
std::string delim = gDirUtilp->getDirDelimiter();
@@ -186,11 +188,6 @@ BOOL LLFadeEventTimer::tick()
return FALSE;
}
-void* create_overlap_panel(void* data)
-{
- return new LLOverlapPanel();
-}
-
// Constructor
LLFloaterUIPreview::LLFloaterUIPreview(const LLSD& key)
: LLFloater(key),
@@ -204,7 +201,6 @@ LLFloaterUIPreview::LLFloaterUIPreview(const LLSD& key)
{
sInstance = this;
- mFactoryMap["overlap_panel"] = LLCallbackMap(create_overlap_panel, NULL);
// called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_ui_preview.xml");
}
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
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
index 0059bfd2dc..9ab57a9d76 100644
--- a/indra/newview/lllocationhistory.cpp
+++ b/indra/newview/lllocationhistory.cpp
@@ -42,7 +42,6 @@
#include "llviewerregion.h"
#include "llviewerparcelmgr.h"
-
void addLocationHistory()
{
LLVector3 position = gAgent.getPositionAgent();
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 778a2299f5..7bfe94043f 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -337,7 +337,7 @@ BOOL LLPanelPicks::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
mPopupMenu->buildDrawLabels();
mPopupMenu->updateParent(LLMenuGL::sMenuContainer);
- ((LLContextMenu*)mPopupMenu)->show(x, y, FALSE);
+ ((LLContextMenu*)mPopupMenu)->show(x, y);
LLMenuGL::showPopup(this, mPopupMenu, x, y);
}
return TRUE;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 637d072cf4..039faa2bf9 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1550,6 +1550,12 @@ void LLViewerWindow::initWorldUI()
gIMMgr = LLIMMgr::getInstance();
+ // side tray
+ getRootView()->addChild(LLSideTray::getInstance());
+
+ getRootView()->sendChildToFront(gFloaterView);
+ getRootView()->sendChildToFront(gSnapshotFloaterView);
+
// new bottom panel
gBottomTray = new LLBottomTray();
LLRect rc = gBottomTray->getRect();
@@ -1628,13 +1634,12 @@ void LLViewerWindow::initWorldUI()
getRootView()->addChild(gStatusBar);
getRootView()->addChild(navbar);
- // side tray
- getRootView()->addChild(LLSideTray::getInstance());
//sidetray
//then notify area
//then menu
- getRootView()->sendChildToFront(LLSideTray::getInstance());
+ //getRootView()->sendChildToFront(LLSideTray::getInstance());
+
getRootView()->sendChildToFront(gNotifyBoxView);
// menu holder appears on top to get first pass at all mouse events
getRootView()->sendChildToFront(gMenuHolder);