Added Restore to Last Position confirmation and callback methods.

  LLItemBridge::restoreToWorldConfirm()
  LLItemBridge::restoreToWorldCallback()

3 files changed, 30 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 82224d6..557926c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-05-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llinventorybridge.cpp:
+        Added Restore to Last Position confirmation and callback methods.
+          LLItemBridge::restoreToWorldConfirm()
+          LLItemBridge::restoreToWorldCallback()
+        * linden/indra/newview/llinventorybridge.h: 
+        Ditto.
+
+
         * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
         Added ConfirmRestoreToWorld alert text.
 
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 34277f7..65922cc 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -816,6 +816,24 @@ void LLItemBridge::restoreItem()
         }
 }
 
+
+// virtual
+void LLItemBridge::restoreToWorldConfirm()
+{
+        gViewerWindow->alertXml("ConfirmRestoreToWorld", LLItemBridge::restoreToWorldCallback, (void *)this);
+}
+
+// static
+void LLItemBridge::restoreToWorldCallback(S32 option, void *userdata)
+{
+        if( option == 0 )
+        {
+                // They confirmed it. Here we go!
+                ((LLItemBridge *) userdata)->restoreToWorld();
+        }
+}
+
+// virtual
 void LLItemBridge::restoreToWorld()
 {
         LLViewerInventoryItem* itemp = (LLViewerInventoryItem*)getItem();
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index eb17432..a4f59fe 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -244,7 +244,11 @@ public:
 
         virtual void selectItem();
         virtual void restoreItem();
+
         virtual void restoreToWorld();
+        virtual void restoreToWorldConfirm();
+        static  void restoreToWorldCallback(S32 option, void *userdata);
+
 
         virtual LLUIImagePtr getIcon() const;
         virtual const std::string& getDisplayName() const;