aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-11 17:59:07 -0700
committerMcCabe Maxsted2009-09-11 17:59:07 -0700
commit6009bbe5686f9468827c612a7d8ac66b8abda422 (patch)
tree4eb9894c53913f190c0e519a1e1554b3c03324ce
parentFixed browser window showing wrong title (diff)
downloadmeta-impy-6009bbe5686f9468827c612a7d8ac66b8abda422.zip
meta-impy-6009bbe5686f9468827c612a7d8ac66b8abda422.tar.gz
meta-impy-6009bbe5686f9468827c612a7d8ac66b8abda422.tar.bz2
meta-impy-6009bbe5686f9468827c612a7d8ac66b8abda422.tar.xz
Fixed double click tp from working on HUDs
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/lltoolpie.cpp7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 636982a..86b21dc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -20,6 +20,11 @@
20 20
21 modified: linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml 21 modified: linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
22 22
23
24 * Fixed double click tp from working on HUDs.
25
26 modified: linden/indra/newview/lltoolpie.cpp
27
23 28
242009-09-10 McCabe Maxsted <hakushakukun@gmail.com> 292009-09-10 McCabe Maxsted <hakushakukun@gmail.com>
25 30
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 7f3bd82..921931b 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -646,9 +646,10 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
646 else if (mPick.mObjectID.notNull() 646 else if (mPick.mObjectID.notNull()
647 && !mPick.mPosGlobal.isExactlyZero()) 647 && !mPick.mPosGlobal.isExactlyZero())
648 { 648 {
649 // Hit an object 649 //Zwagoth: No more teleport to HUD attachments. >:o
650 // HACK: Call the last hit position the point we hit on the object 650 if(mPick.getObject().notNull() && mPick.getObject()->isHUDAttachment())
651 //gLastHitPosGlobal += gLastHitObjectOffset; 651 return FALSE;
652
652 handle_go_to(); 653 handle_go_to();
653 return TRUE; 654 return TRUE;
654 } 655 }