From d0e3cee4c2e44b7bffd69e4138ecbfd04bf60601 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 29 Apr 2012 10:18:00 +1000 Subject: It's April, onefang ate all the Easter eggs. Burp. --- linden/indra/newview/llgesturemgr.cpp | 241 +-------------------- .../newview/skins/default/textures/cakeisalie.png | Bin 124929 -> 0 bytes .../newview/skins/default/textures/ceilingcat.png | Bin 139515 -> 0 bytes .../newview/skins/default/textures/easteregg.png | Bin 395345 -> 0 bytes .../indra/newview/skins/default/textures/hugs.png | Bin 204219 -> 0 bytes .../newview/skins/default/textures/nomnom.png | Bin 380325 -> 0 bytes .../newview/skins/default/textures/octopus.png | Bin 442610 -> 0 bytes .../newview/skins/default/textures/zombiecat.png | Bin 334660 -> 0 bytes 8 files changed, 1 insertion(+), 240 deletions(-) delete mode 100644 linden/indra/newview/skins/default/textures/cakeisalie.png delete mode 100644 linden/indra/newview/skins/default/textures/ceilingcat.png delete mode 100644 linden/indra/newview/skins/default/textures/easteregg.png delete mode 100644 linden/indra/newview/skins/default/textures/hugs.png delete mode 100644 linden/indra/newview/skins/default/textures/nomnom.png delete mode 100644 linden/indra/newview/skins/default/textures/octopus.png delete mode 100644 linden/indra/newview/skins/default/textures/zombiecat.png diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp index bd05cb3..f806ccc 100644 --- a/linden/indra/newview/llgesturemgr.cpp +++ b/linden/indra/newview/llgesturemgr.cpp @@ -531,7 +531,6 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s gesture = NULL; } - if (matching.size() > 0) { // choose one at random @@ -565,246 +564,8 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s found_gestures = TRUE; } } - else if (LLStringUtil::compareInsensitive("/icanhaseasteregg", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhaseastereggs", cur_token) == 0) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("easteregg.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "Easter Egg!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhascookie", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhascookies", cur_token) == 0) - { - LLChat chat; - chat.mText = "I made you a cookie but I eated it :("; - chat.mSourceType = CHAT_SOURCE_SYSTEM; - LLFloaterChat::addChat(chat); - if (revised_string) - { - revised_string->assign(LLStringUtil::null); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasfailbook", cur_token) == 0) - { - LLWeb::loadURLInternal("http://failbook.failblog.org/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhaszombie", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhaszombies", cur_token) == 0) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("zombiecat.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "Zombiecat!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhassupport", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhashelp", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhashalp", cur_token) == 0) - { - LLWeb::loadURLInternal("http://support.kokuaviewer.org/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasblog", cur_token) == 0) - { - LLWeb::loadURLInternal("http://kokuaviewer.org/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhascodie", cur_token) == 0) - { - LLChat chat; - chat.mText = "All work and no play makes Codie a dull girl. All work and no play..."; - chat.mSourceType = CHAT_SOURCE_SYSTEM; - LLFloaterChat::addChat(chat); - if (revised_string) - { - revised_string->assign(LLStringUtil::null); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasfail", cur_token) == 0) - { - LLWeb::loadURLInternal("http://www.failblog.org/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasdownload", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhasdownloads", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhasupdate", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhasupdates", cur_token) == 0 ) - { - LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasfeatures", cur_token) == 0) - { - LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/Imprudence:Features"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhaswiki", cur_token) == 0) - { - LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasbugs", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhasbug", cur_token) == 0 ) - { - LLWeb::loadURLInternal("http://redmine.kokuaviewer.org/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasgit", cur_token) == 0) - { - LLWeb::loadURLInternal("http://github.com/imprudence/imprudence/"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasplurk", cur_token) == 0) - { - LLWeb::loadURLInternal("http://plurk.com/imprudence"); - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhastwitter", cur_token) == 0) - { - LLWeb::loadURLInternal("http://twitter.com/ImpViewer"); - return TRUE; - } - - else if (LLStringUtil::compareInsensitive("/icanhasimprudence", cur_token) == 0) - { - LLChat chat; - chat.mText = "You are using it right now, silly!..."; - chat.mSourceType = CHAT_SOURCE_SYSTEM; - LLFloaterChat::addChat(chat); - if (revised_string) - { - revised_string->assign(LLStringUtil::null); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasnoms", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhasnom", cur_token) == 0) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("nomnom.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "Om nom nom!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhasceilingcat", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhascielingcat", cur_token) == 0) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("ceilingcat.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "Ceiling Cat is watching you!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhascake", cur_token) == 0 ) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("cakeisalie.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "THE CAKE IS A LIE!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhastentacles", cur_token) == 0 ) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("octopus.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "All hail the mighty octopus!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - else if (LLStringUtil::compareInsensitive("/icanhashugs", cur_token) == 0 || - LLStringUtil::compareInsensitive("/icanhashug", cur_token) == 0) - { - LLViewerImage* kitteh = gImageList.getImageFromFile("hugs.png", TRUE, TRUE); - if (kitteh) - { - S32 left, top; - gFloaterView->getNewFloaterPosition(&left, &top); - LLRect rect = gSavedSettings.getRect("PreviewTextureRect"); - rect.translate(left - rect.mLeft, top - rect.mTop); - - LLPreviewTexture* preview; - preview = new LLPreviewTexture(rect, "Yes, you can has hugs!", kitteh); - preview->setSourceID(LLUUID::generateNewID()); - preview->setFocus(TRUE); - preview->center(); - gFloaterView->adjustToFitScreen(preview, FALSE); - } - return TRUE; - } - } - + if(!gesture) { // This token doesn't match a gesture. Pass it through to the output. diff --git a/linden/indra/newview/skins/default/textures/cakeisalie.png b/linden/indra/newview/skins/default/textures/cakeisalie.png deleted file mode 100644 index bc8af84..0000000 Binary files a/linden/indra/newview/skins/default/textures/cakeisalie.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/ceilingcat.png b/linden/indra/newview/skins/default/textures/ceilingcat.png deleted file mode 100644 index 5cf5285..0000000 Binary files a/linden/indra/newview/skins/default/textures/ceilingcat.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/easteregg.png b/linden/indra/newview/skins/default/textures/easteregg.png deleted file mode 100644 index 75eaef7..0000000 Binary files a/linden/indra/newview/skins/default/textures/easteregg.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/hugs.png b/linden/indra/newview/skins/default/textures/hugs.png deleted file mode 100644 index d612793..0000000 Binary files a/linden/indra/newview/skins/default/textures/hugs.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/nomnom.png b/linden/indra/newview/skins/default/textures/nomnom.png deleted file mode 100644 index ffc70ef..0000000 Binary files a/linden/indra/newview/skins/default/textures/nomnom.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/octopus.png b/linden/indra/newview/skins/default/textures/octopus.png deleted file mode 100644 index 91765f9..0000000 Binary files a/linden/indra/newview/skins/default/textures/octopus.png and /dev/null differ diff --git a/linden/indra/newview/skins/default/textures/zombiecat.png b/linden/indra/newview/skins/default/textures/zombiecat.png deleted file mode 100644 index 93392c0..0000000 Binary files a/linden/indra/newview/skins/default/textures/zombiecat.png and /dev/null differ -- cgit v1.1