diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ae8cf305d274bbeab3c071b58ef1b1b85c090f9b..59ec31d9e7e45fc297b3e69540320206a577f743 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -246,6 +246,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
 	mShortTitle(p.short_title),
 	mSingleInstance(p.single_instance),
 	mReuseInstance(p.reuse_instance.isProvided() ? p.reuse_instance : p.single_instance), // reuse single-instance floaters by default
+	mIsReuseInitialized(p.reuse_instance.isProvided()),
 	mKey(key),
 	mCanTearOff(p.can_tear_off),
 	mCanMinimize(p.can_minimize),
@@ -3129,6 +3130,9 @@ void LLFloaterView::setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LL
 	case LLToolBarEnums::TOOLBAR_RIGHT:
 		mToolbarRightRect = toolbar_rect;
 		break;
+	case LLToolBarEnums::TOOLBAR_TOP:
+		mToolbarTopRect = toolbar_rect;
+		break;
 	default:
 		LL_WARNS() << "setToolbarRect() passed odd toolbar number " << (S32) tb << LL_ENDL;
 		break;
@@ -3224,6 +3228,7 @@ void LLFloater::initFromParams(const LLFloater::Params& p)
 	mLegacyHeaderHeight = p.legacy_header_height;
 	mSingleInstance = p.single_instance;
 	mReuseInstance = p.reuse_instance.isProvided() ? p.reuse_instance : p.single_instance;
+	mIsReuseInitialized = p.reuse_instance.isProvided();
 
 	mPositioning = p.positioning;
 
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 715cada1cb189f300af894c5e426b7270f8d91f1..8e79418e8de940e6b743b2cb10f4d99640f0444d 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -604,6 +604,7 @@ class LLFloaterView : public LLUICtrl
 	LLRect				mToolbarLeftRect;
 	LLRect				mToolbarBottomRect;
 	LLRect				mToolbarRightRect;
+	LLRect				mToolbarTopRect;
 	LLHandle<LLView>	mSnapView;
 	BOOL			mFocusCycleMode;
 	S32				mSnapOffsetBottom;