From eb830215018955be9e4eb5ce1846d10dc0524210 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 26 Oct 2020 05:06:55 -0400
Subject: [PATCH] Fix call dialog
---
indra/llui/lldockcontrol.cpp | 7 +++----
indra/llui/llfloater.cpp | 7 +++++++
indra/llui/llfloater.h | 2 ++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
index 7ef2b9822ce..e5ed1ad3b65 100644
--- a/indra/llui/lldockcontrol.cpp
+++ b/indra/llui/lldockcontrol.cpp
@@ -74,8 +74,6 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater,
{
mDockWidgetVisible = false;
}
-
- mNonToolbarPanelHandle = dockableFloater->getRootView()->getChild<LLView>("non_toolbar_panel")->getHandle();
}
LLDockControl::~LLDockControl()
@@ -99,10 +97,11 @@ void LLDockControl::setDock(LLView* dockWidget)
void LLDockControl::getAllowedRect(LLRect& rect)
{
- if (!mNonToolbarPanelHandle.isDead())
+ if (!mNonToolbarPanelHandle.get())
{
- rect = mNonToolbarPanelHandle.get()->getRect();
+ mNonToolbarPanelHandle = LLUI::getRootView()->getChild<LLLayoutPanel>("non_toolbar_panel")->getHandle();
}
+ rect = mNonToolbarPanelHandle.get()->getRect();
}
void LLDockControl::repositionDockable()
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 17421969a42..db00fe1e2ae 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -3543,6 +3543,13 @@ LLCoordFloater::LLCoordFloater(const LLCoordCommon& other, LLFloater& floater)
convertFromCommon(other);
}
+LLCoordFloater& LLCoordFloater::operator=(const LLCoordFloater& other)
+{
+ mFloater = other.mFloater;
+ coord_t::operator =(other);
+ return *this;
+}
+
void LLCoordFloater::setFloater(LLFloater& floater)
{
mFloater = floater.getHandle();
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index e6309d79ed4..385e174ae01 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -107,6 +107,8 @@ struct LLCoordFloater : LLCoord<LL_COORD_FLOATER>
return *this;
}
+ LLCoordFloater& operator=(const LLCoordFloater& other);
+
bool operator==(const LLCoordFloater& other) const;
bool operator!=(const LLCoordFloater& other) const { return !(*this == other); }
--
GitLab