diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-03 16:15:34 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-03 16:15:34 +0200 |
commit | 6ebbc5edf6c95f68088577f82b2c1daf73b68205 (patch) | |
tree | 350ce20fd0267b785c37f019bc571ddc82c40093 /indra/newview/llimview.cpp | |
parent | a9aa9f41188c78b4025bea7657ead279a2877fd5 (diff) |
fixed EXT-4764 “Forbid connecting to different voice channels at once”,
removed redundant call status notifications: ringing, connected, hang_up,
unavailable, answering;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index db6b2041f8..9a3a4c0125 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2985,48 +2985,6 @@ public: } }; -LLCallInfoDialog::LLCallInfoDialog(const LLSD& payload) : LLCallDialog(payload) -{ -} - -BOOL LLCallInfoDialog::postBuild() -{ - // init notification's lifetime - std::istringstream ss( getString("lifetime") ); - if (!(ss >> mLifetime)) - { - mLifetime = DEFAULT_LIFETIME; - } - return LLCallDialog::postBuild(); -} - -void LLCallInfoDialog::onOpen(const LLSD& key) -{ - if(key.has("msg")) - { - std::string msg = key["msg"]; - getChild<LLTextBox>("msg")->setValue(msg); - } - - mLifetimeTimer.start(); -} - -void LLCallInfoDialog::show(const std::string& status_name, const LLSD& args) -{ - LLUIString message = LLTrans::getString(status_name); - message.setArgs(args); - - LLSD payload; - payload["msg"] = message; - LLFloater* inst = LLFloaterReg::findInstance("call_info"); - - // avoid recreate instance with the same message - if (inst == NULL || message.getString() != inst->getChild<LLTextBox>("msg")->getValue()) - { - LLFloaterReg::showInstance("call_info", payload); - } -} - LLHTTPRegistration<LLViewerChatterBoxSessionStartReply> gHTTPRegistrationMessageChatterboxsessionstartreply( "/message/ChatterBoxSessionStartReply"); |