aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llgesturemgr.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-20 20:04:27 -0700
committerMcCabe Maxsted2010-08-26 11:23:35 -0700
commitb1afaa8f9702876c2ea1d677c931bc1468860200 (patch)
tree8e57497ee49c22eef1e0de5d476f135314109e00 /linden/indra/newview/llgesturemgr.cpp
parentfetch updated Linux* libndofdev (0.3.1) (diff)
downloadmeta-impy-b1afaa8f9702876c2ea1d677c931bc1468860200.zip
meta-impy-b1afaa8f9702876c2ea1d677c931bc1468860200.tar.gz
meta-impy-b1afaa8f9702876c2ea1d677c931bc1468860200.tar.bz2
meta-impy-b1afaa8f9702876c2ea1d677c931bc1468860200.tar.xz
Updated artwork package to include latest windows installer (and added a little easter egg while I was there ;)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llgesturemgr.cpp25
1 files changed, 24 insertions, 1 deletions
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index a341154..d344630 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -55,8 +55,10 @@
55#include "llfloaterchat.h" 55#include "llfloaterchat.h"
56#include "llinventorymodel.h" 56#include "llinventorymodel.h"
57#include "llnotify.h" 57#include "llnotify.h"
58#include "llpreviewtexture.h"
58#include "llviewermessage.h" 59#include "llviewermessage.h"
59#include "llvoavatar.h" 60#include "llvoavatar.h"
61#include "llviewerimagelist.h"
60#include "llviewerstats.h" 62#include "llviewerstats.h"
61 63
62LLGestureManager gGestureManager; 64LLGestureManager gGestureManager;
@@ -561,7 +563,28 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
561 found_gestures = TRUE; 563 found_gestures = TRUE;
562 } 564 }
563 } 565 }
564 else if (LLStringUtil::compareInsensitive("/icanhascookie", cur_token) == 0) 566 else if (LLStringUtil::compareInsensitive("/icanhaseasteregg", cur_token) == 0 ||
567 LLStringUtil::compareInsensitive("/icanhaseastereggs", cur_token) == 0)
568 {
569 LLViewerImage* kitteh = gImageList.getImageFromFile("easteregg.png", TRUE, TRUE);
570 if (kitteh)
571 {
572 S32 left, top;
573 gFloaterView->getNewFloaterPosition(&left, &top);
574 LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
575 rect.translate(left - rect.mLeft, top - rect.mTop);
576
577 LLPreviewTexture* preview;
578 preview = new LLPreviewTexture(rect, "Easter Egg!", kitteh);
579 preview->setSourceID(LLUUID::generateNewID());
580 preview->setFocus(TRUE);
581 preview->center();
582 gFloaterView->adjustToFitScreen(preview, FALSE);
583 }
584 return TRUE;
585 }
586 else if (LLStringUtil::compareInsensitive("/icanhascookie", cur_token) == 0 ||
587 LLStringUtil::compareInsensitive("/icanhascookies", cur_token) == 0)
565 { 588 {
566 LLChat chat; 589 LLChat chat;
567 chat.mText = "I made you a cookie but I eated it"; 590 chat.mText = "I made you a cookie but I eated it";