From 79787d1646b02bf89c372e04047dfca37b2b27a1 Mon Sep 17 00:00:00 2001 From: ziree Date: Sat, 25 Jun 2011 01:43:45 +0200 Subject: [PATCH] Added phantom on/off message. Fixes FIRE-1318 --- indra/newview/llagent.cpp | 16 +++++++++++++++ indra/newview/llagent.h | 4 ++-- .../skins/default/xui/en/notifications.xml | 20 ++++++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 325b4e9396..d477837ecf 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4123,6 +4123,22 @@ void LLAgent::renderAutoPilotTarget() } } +// Firestorm Phantom +void LLAgent::togglePhantom() +{ + mPhantom = !mPhantom; + if(mPhantom) + LLNotificationsUtil::add("PhantomOn", LLSD()); + else + LLNotificationsUtil::add("PhantomOff", LLSD()); +} + +bool LLAgent::getPhantom() const +{ + return mPhantom; +} +// Firestorm Phantom + /********************************************************************************/ LLAgentQueryManager gAgentQueryManager; diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index b6ed9699e6..63c02e8f66 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -813,8 +813,8 @@ public: **/ public: - void togglePhantom() { mPhantom = !mPhantom; } - bool getPhantom() const { return mPhantom; } + void togglePhantom(); + bool getPhantom() const; private: BOOL mPhantom; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a530097925..0dc11ae653 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7355,4 +7355,22 @@ This will send the following information to the current IM session: - \ No newline at end of file + + + +Phantom mode on. + + + +Phantom mode off. + + + + +