merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index 2cf1f555ea..ce2d56612c 100644
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -36,7 +36,7 @@
 
 #include "llscrolllistctrl.h"
 
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewermessage.h"
 #include "llappviewer.h"		// gPacificDaylightTime
 
@@ -55,7 +55,7 @@ LLFloaterBump::LLFloaterBump()
 {
 	sInstance = this;
 
-	gUICtrlFactory->buildFloater(this, "floater_bumps.xml");
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml");
 }
 
 
@@ -78,7 +78,7 @@ void LLFloaterBump::show(void *contents)
 		sInstance = new LLFloaterBump();
 	}
 	
-	LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(sInstance, "bump_list");
+	LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("bump_list");
 	if (!list) return;
 	list->deleteAllItems();