diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dbd5b2d59..0a4e4183b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6942,22 +6942,6 @@ This should be as low as possible, but too low may break functionality 100 - FloaterIMRect - - Comment - Rectangle for IM window - Persist - 1 - Type - Rect - Value - - 0 - 160 - 500 - 0 - - FloaterInspectRect Comment diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 472836c3a..d6188bcc0 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3312,12 +3312,6 @@ void update_group_floaters(const LLUUID& group_id) fa->resetGroupList(); } - if (gIMMgr) - { - // update the talk view - gIMMgr->refresh(); - } - gAgent.fireEvent(new LLOldEvents::LLEvent(&gAgent, "new group"), ""); } diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h index b031e312a..71440d8bb 100644 --- a/indra/newview/llchatbar.h +++ b/indra/newview/llchatbar.h @@ -84,7 +84,6 @@ public: // callbacks void onClickSay(LLUICtrl* ctrl); - static void onTabClick( void* userdata ); void onInputEditorKeystroke(); static void onInputEditorFocusLost(); static void onInputEditorGainFocus(); diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 96febbb73..a28d04be0 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -900,19 +900,6 @@ void LLFloaterIMPanel::setInputFocus( BOOL b ) mInputEditor->setFocus( b ); } - -void LLFloaterIMPanel::selectAll() -{ - mInputEditor->selectAll(); -} - - -void LLFloaterIMPanel::selectNone() -{ - mInputEditor->deselect(); -} - - BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask ) { BOOL handled = FALSE; @@ -1040,13 +1027,6 @@ BOOL LLFloaterIMPanel::isInviteAllowed() const } -// static -void LLFloaterIMPanel::onTabClick(void* userdata) -{ - LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata; - self->setInputFocus(TRUE); -} - void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value) { if (value.isUndefined()) @@ -1113,14 +1093,6 @@ void LLFloaterIMPanel::onClickHistory() } } -// static -void LLFloaterIMPanel::onClickStartCall(void* userdata) -{ - LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata; - - self->mVoiceChannel->activate(); -} - void LLFloaterIMPanel::onClickToggleActiveSpeakers(const LLSD& value) { childSetVisible("active_speakers_panel", !value); diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index fb5e3b3d0..5ec7c692c 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -34,7 +34,6 @@ #include "llfloater.h" #include "lllogchat.h" -#include "llstyle.h" class LLAvatarName; class LLButton; @@ -89,8 +88,6 @@ public: void setInputFocus( BOOL b ); - void selectAll(); - void selectNone(); void setVisible(BOOL b); S32 getNumUnreadMessages() { return mNumUnreadMessages; } @@ -107,12 +104,9 @@ public: void onInputEditorFocusReceived(); void onInputEditorFocusLost(); void onInputEditorKeystroke(LLLineEditor* caller); - static void onTabClick( void* userdata ); void onClickHistory(); void onFlyoutCommit(class LLComboBox* flyout, const LLSD& value); - static void onClickStartCall( void* userdata ); - static void onClickEndCall( void* userdata ); void onClickToggleActiveSpeakers(const LLSD& value); static void* createSpeakersPanel(void* data); @@ -120,11 +114,9 @@ public: void onClickMuteVoice(); const LLUUID& getSessionID() const { return mSessionUUID; } - const LLUUID& getOtherParticipantID() const { return mOtherParticipantUUID; } void processSessionUpdate(const LLSD& update); LLVoiceChannel* getVoiceChannel() { return mVoiceChannel; } LLIMSpeakerMgr* getSpeakerManager() const { return mSpeakers; } // Singu TODO: LLIMModel::getSpeakerManager - EInstantMessage getDialogType() const { return mDialog; } void sessionInitReplyReceived(const LLUUID& im_session_id); @@ -147,9 +139,6 @@ public: GROUP_SESSION, ADHOC_SESSION } SType; - bool isP2PSessionType() const { return mSessionType == P2P_SESSION;} - bool isAdHocSessionType() const { return mSessionType == ADHOC_SESSION;} - bool isGroupSessionType() const { return mSessionType == GROUP_SESSION;} SType mSessionType; // LLIMModel Functionality @@ -257,13 +246,6 @@ private: CachedUICtrl mStartCallBtn; CachedUICtrl mSendBtn; CachedUICtrl mMuteBtn; - - void disableWhileSessionStarting(); - - typedef std::map styleMap; - static styleMap mStyleMap; - - static std::set sFloaterIMPanels; }; diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 8b0bd2adb..efd86ff9e 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -243,42 +243,6 @@ LLUUID LLIMMgr::computeSessionID( return session_id; } -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// LLFloaterIM -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -LLFloaterIM::LLFloaterIM() -{ - // autoresize=false is necessary to avoid resizing of the IM window whenever - // a session is opened or closed (it would otherwise resize the window to match - // the size of the im-sesssion when they were created. This happens in - // LLMultiFloater::resizeToContents() when called through LLMultiFloater::addFloater()) - this->mAutoResize = FALSE; - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_im.xml"); -} - -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Class LLIMViewFriendObserver -// -// Bridge to suport knowing when the inventory has changed. -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -class LLIMViewFriendObserver : public LLFriendObserver -{ -public: - LLIMViewFriendObserver(LLIMMgr* tv) : mTV(tv) {} - virtual ~LLIMViewFriendObserver() {} - virtual void changed(U32 mask) - { - if(mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE)) - { - mTV->refresh(); - } - } -protected: - LLIMMgr* mTV; -}; - bool inviteUserResponse(const LLSD& notification, const LLSD& response) { @@ -378,22 +342,6 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response) // Public Static Member Functions // -// This is a helper function to determine what kind of im session -// should be used for the given agent. -// static -EInstantMessage LLIMMgr::defaultIMTypeForAgent(const LLUUID& agent_id) -{ - EInstantMessage type = IM_NOTHING_SPECIAL; - if (LLAvatarActions::isFriend(agent_id)) - { - if(LLAvatarTracker::instance().isBuddyOnline(agent_id)) - { - type = IM_SESSION_CONFERENCE_START; - } - } - return type; -} - // static //void LLIMMgr::onPinButton(void*) //{ @@ -447,26 +395,14 @@ void LLIMMgr::toggle(void*) // LLIMMgr::LLIMMgr() : - mFriendObserver(NULL), - mIMReceived(FALSE), mIMUnreadCount(0) { - mFriendObserver = new LLIMViewFriendObserver(this); - LLAvatarTracker::instance().addObserver(mFriendObserver); - - // *HACK: use floater to initialize string constants from xml file - // then delete it right away - LLFloaterIM* dummy_floater = new LLFloaterIM(); - delete dummy_floater; - mPendingInvitations = LLSD::emptyMap(); mPendingAgentListUpdates = LLSD::emptyMap(); } LLIMMgr::~LLIMMgr() { - LLAvatarTracker::instance().removeObserver(mFriendObserver); - delete mFriendObserver; // Children all cleaned up by default view destructor. } @@ -616,7 +552,6 @@ void LLIMMgr::addMessage( } //notify of a new IM - notifyNewIM(); mIMUnreadCount++; } } @@ -647,25 +582,11 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess } } -void LLIMMgr::notifyNewIM() -{ - if(!gIMMgr->getFloaterOpen()) - { - mIMReceived = TRUE; - } -} - void LLIMMgr::clearNewIMNotification() { - mIMReceived = FALSE; mIMUnreadCount = 0; } -BOOL LLIMMgr::getIMReceived() const -{ - return mIMReceived; -} - int LLIMMgr::getIMUnreadCount() { return mIMUnreadCount; @@ -954,10 +875,6 @@ void LLIMMgr::onInviteNameLookup(const LLUUID& id, const std::string& full_name, &inviteUserResponse); } -void LLIMMgr::refresh() -{ -} - void LLIMMgr::setFloaterOpen(BOOL set_open) { if (set_open) diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 3e7bc6fff..f5e59990a 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -41,7 +41,6 @@ class LLFloaterChatterBox; class LLFloaterIMPanel; -class LLFriendObserver; class LLIMMgr : public LLSingleton { @@ -125,17 +124,12 @@ public: void processIMTypingStart(const LLIMInfo* im_info); void processIMTypingStop(const LLIMInfo* im_info); - // Rebuild stuff - void refresh(); - - void notifyNewIM(); void clearNewIMNotification(); // automatically start a call once the session has initialized void autoStartCallOnStartup(const LLUUID& session_id); // IM received that you haven't seen yet - BOOL getIMReceived() const; int getIMUnreadCount(); void setFloaterOpen(BOOL open); /*Flawfinder: ignore*/ @@ -151,10 +145,6 @@ public: static void toggle(void*); - // This is a helper function to determine what kind of im session - // should be used for the given agent. - static EInstantMessage defaultIMTypeForAgent(const LLUUID& agent_id); - BOOL hasSession(const LLUUID& session_id); // This method returns the im panel corresponding to the uuid @@ -225,10 +215,8 @@ private: private: std::set > mFloaters; - LLFriendObserver* mFriendObserver; // An IM has been received that you haven't seen yet. - BOOL mIMReceived; int mIMUnreadCount; LLSD mPendingInvitations; @@ -241,14 +229,7 @@ public: S32 getIgnoreGroupListCount() { return mIgnoreGroupList.size(); } }; - -class LLFloaterIM : public LLMultiFloater -{ -public: - LLFloaterIM(); -}; - // Globals extern LLIMMgr *gIMMgr; -#endif // LL_LLIMView_H +#endif // LL_LLIMVIEW_H diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 673b0df79..787a345c8 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3656,7 +3656,6 @@ void set_god_level(U8 god_level) { U8 old_god_level = gAgent.getGodLevel(); gAgent.setGodLevel( god_level ); - gIMMgr->refresh(); LLViewerParcelMgr::getInstance()->notifyObservers(); // Some classifieds change visibility on god mode diff --git a/indra/newview/skins/default/xui/de/floater_im.xml b/indra/newview/skins/default/xui/de/floater_im.xml deleted file mode 100644 index 79f9ab2ee..000000000 --- a/indra/newview/skins/default/xui/de/floater_im.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/indra/newview/skins/default/xui/en-us/floater_im.xml b/indra/newview/skins/default/xui/en-us/floater_im.xml deleted file mode 100644 index 25fe8c53f..000000000 --- a/indra/newview/skins/default/xui/en-us/floater_im.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml deleted file mode 100644 index 55cf5cf51..000000000 --- a/indra/newview/skins/default/xui/es/floater_im.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - Eres el único usuario en la sesión. - - - [NAME] está fuera de línea. - - - Pulsa el botón [BUTTON NAME] para aceptar/conectar este chat de voz. - - - Has ignorado a este residente. Al enviarle un mensaje, automáticamente dejarás de ignorarle. - - - Error al hacer lo solicitado; por favor, inténtalo más tarde. - - - No tienes los permisos suficientes. - - - La sesión ya acabó - - - No tienes esa capacidad. - - - No eres un moderador de la sesión. - - - Un moderador del grupo ha desactivado tu chat de texto. - - - No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT]. - - - No se ha podido enviar tu mensaje a la sesión de chat con [RECIPIENT]. - - - Has sido expulsado del grupo. - - - Ya no tendrás más la capacidad de estar en la sesión de chat. - - diff --git a/indra/newview/skins/default/xui/fr/floater_im.xml b/indra/newview/skins/default/xui/fr/floater_im.xml deleted file mode 100644 index 358ab6f42..000000000 --- a/indra/newview/skins/default/xui/fr/floater_im.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - Vous êtes le (la) seul(e) participant à cette session, zut alors! - - - [NAME] is offline - - - Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME]. - - - Vous ignorez ce résident (mute). Si vous lui envoyez un message, il ne sera plus ignoré. - - - Erreur lors de la requête, veuillez réessayer ultérieurement. - - - Vous n'avez pas les droits requis. - - - La session a expiré - - - Vous n'avez pas ce pouvoir. - - - Vous n'êtes pas modérateur(trice) de cette session. - - - Un modérateur de groupe a désactivé votre chat écrit. - - - Impossible d'ajouter des participants à la session de chat avec [RECIPIENT]. - - - Impossible d'envoyer votre message à la session de chat avec [RECIPIENT]. - - - Vous avez été supprimé(e) du groupe. - - - Vous ne pouvez plus participer à la session de chat. - - diff --git a/indra/newview/skins/default/xui/pt/floater_im.xml b/indra/newview/skins/default/xui/pt/floater_im.xml deleted file mode 100644 index 75c340933..000000000 --- a/indra/newview/skins/default/xui/pt/floater_im.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - Você é o único usuário desta sessão. - - - [FIRST] [LAST] está offline. - - - Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz. - - - Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente. - - - Erro na requisição, por favor, tente novamente. - - - Você não tem permissões suficientes. - - - A sessão deixou de existir - - - Você não possui esta habilidade. - - - Você não é um moderador de sessão. - - - Um moderador do grupo desabilitou seu bate-papo em texto. - - - Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT]. - - - Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT]. - - - Você foi removido do grupo. - - - Você não possui mais a habilidade de estar na sessão de bate-papo. - -