merge

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 561ad9535b..25642f0226 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -356,12 +356,12 @@ void LLFloaterPathfindingCharacters::onTakeCopyCharactersClicked()
 

 void LLFloaterPathfindingCharacters::onReturnCharactersClicked()

 {

-	llwarns << "functionality has not yet been implemented to return characters" << llendl;

+	handle_object_return();

 }

 

 void LLFloaterPathfindingCharacters::onDeleteCharactersClicked()

 {

-	handle_object_delete();
+	handle_object_delete();

 }

 

 void LLFloaterPathfindingCharacters::onTeleportCharacterToMeClicked()

@@ -528,7 +528,7 @@ void LLFloaterPathfindingCharacters::setEnableActionFields(BOOL pEnabled)
 	mShowBeaconCheckBox->setEnabled(pEnabled);

 	mTakeBtn->setEnabled(pEnabled && tools_visible_take_object());

 	mTakeCopyBtn->setEnabled(pEnabled && enable_object_take_copy());

-	mReturnBtn->setEnabled(false && pEnabled);

+	mReturnBtn->setEnabled(pEnabled && enable_object_return());

 	mDeleteBtn->setEnabled(pEnabled && enable_object_delete());

 	mTeleportBtn->setEnabled(pEnabled && (mCharactersScrollList->getNumSelected() == 1));

 }