PATH-245: Basic functionality for take, take copy, and delete.

3 files changed, 8 insertions, 7 deletions

diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 33fc1efd8e..4e47d5af9c 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -352,12 +352,12 @@ void LLFloaterPathfindingCharacters::onShowBeaconToggled()
 

 void LLFloaterPathfindingCharacters::onTakeCharactersClicked()

 {

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

+	handle_take();

 }

 

 void LLFloaterPathfindingCharacters::onTakeCopyCharactersClicked()

 {

-	llwarns << "functionality has not yet been implemented to take a copy of characters" << llendl;

+	handle_take_copy();

 }

 

 void LLFloaterPathfindingCharacters::onReturnCharactersClicked()

@@ -367,7 +367,7 @@ void LLFloaterPathfindingCharacters::onReturnCharactersClicked()
 

 void LLFloaterPathfindingCharacters::onDeleteCharactersClicked()

 {

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

+	handle_object_delete();
 }

 

 void LLFloaterPathfindingCharacters::onTeleportCharacterToMeClicked()

@@ -532,10 +532,10 @@ void LLFloaterPathfindingCharacters::setEnableActionFields(BOOL pEnabled)
 {

 	mLabelActions->setEnabled(pEnabled);

 	mShowBeaconCheckBox->setEnabled(false && pEnabled);

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

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

+	mTakeBtn->setEnabled(true && pEnabled);

+	mTakeCopyBtn->setEnabled(true && pEnabled);

 	mReturnBtn->setEnabled(false && pEnabled);

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

+	mDeleteBtn->setEnabled(true && pEnabled);

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

 }

 

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 99540ccce9..d2c441ce73 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -197,7 +197,6 @@ void near_sit_object();
 BOOL is_selection_buy_not_take();
 S32 selection_price();
 BOOL enable_take();
-void handle_take();
 void handle_object_show_inspector();
 void handle_avatar_show_inspector();
 bool confirm_take(const LLSD& notification, const LLSD& response);
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 87cb4efbc4..d5b060aba6 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -95,9 +95,11 @@ void handle_object_open();
 
 // Buy either contents or object itself
 void handle_buy();
+void handle_take();
 void handle_take_copy();
 void handle_look_at_selection(const LLSD& param);
 void handle_zoom_to_object(LLUUID object_id);
+void handle_object_delete();
 
 void handle_buy_land();