aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-25 22:05:17 -0500
committerJacek Antonelli2009-05-25 22:05:17 -0500
commit8d2b12f10225769f2a49226cd97db9b4865bd345 (patch)
tree5e89f25e3c6583df188c0f31c3c702b2589360e6
parentAdded Restore to Last Position confirmation and callback methods. (diff)
downloadmeta-impy-8d2b12f10225769f2a49226cd97db9b4865bd345.zip
meta-impy-8d2b12f10225769f2a49226cd97db9b4865bd345.tar.gz
meta-impy-8d2b12f10225769f2a49226cd97db9b4865bd345.tar.bz2
meta-impy-8d2b12f10225769f2a49226cd97db9b4865bd345.tar.xz
Restore to Last Position has a confirmation dialog now.
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llinventorybridge.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 557926c..5e31313 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
12009-05-25 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-05-25 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llinventorybridge.cpp: 3 * linden/indra/newview/llinventorybridge.cpp:
4 Restore to Last Position has a confirmation dialog now.
5
6
7 * linden/indra/newview/llinventorybridge.cpp:
4 Added Restore to Last Position confirmation and callback methods. 8 Added Restore to Last Position confirmation and callback methods.
5 LLItemBridge::restoreToWorldConfirm() 9 LLItemBridge::restoreToWorldConfirm()
6 LLItemBridge::restoreToWorldCallback() 10 LLItemBridge::restoreToWorldCallback()
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 65922cc..9675165 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -758,7 +758,7 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
758 } 758 }
759 else if ("restoreToWorld" == action) 759 else if ("restoreToWorld" == action)
760 { 760 {
761 restoreToWorld(); 761 restoreToWorldConfirm();
762 } 762 }
763 else if ("restore" == action) 763 else if ("restore" == action)
764 { 764 {