From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- indra/newview/llfloatertelehub.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloatertelehub.cpp') diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp index 530bb87983..1d2d3b98f2 100644 --- a/indra/newview/llfloatertelehub.cpp +++ b/indra/newview/llfloatertelehub.cpp @@ -81,7 +81,7 @@ void LLFloaterTelehub::show() } LLFloaterTelehub::LLFloaterTelehub() -: LLFloater(std::string("telehub")), +: LLFloater(), mTelehubObjectID(), mTelehubObjectName(), mTelehubPos(), @@ -94,6 +94,11 @@ LLFloaterTelehub::LLFloaterTelehub() LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_telehub.xml"); + mObjectSelection = LLSelectMgr::getInstance()->getEditSelection(); +} +BOOL LLFloaterTelehub::postBuild() +{ + childSetAction("connect_btn", onClickConnect, this); childSetAction("disconnect_btn", onClickDisconnect, this); childSetAction("add_spawn_point_btn", onClickAddSpawnPoint, this); @@ -106,9 +111,8 @@ LLFloaterTelehub::LLFloaterTelehub() list->setAllowKeyboardMovement(FALSE); } - mObjectSelection = LLSelectMgr::getInstance()->getEditSelection(); + return TRUE; } - LLFloaterTelehub::~LLFloaterTelehub() { sInstance = NULL; -- cgit v1.2.3