Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LLIMMgr/LLIMPanel Revision] Cleanup of unused/useless classes, functions, members and xmls

Browse Source
This commit is contained in:
Inusaito Sayori
2013-10-10 02:27:26 -04:00
parent c7ff14f224
commit 9e312a3808
13 changed files with 1 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/app_settings/settings.xml
View File

@@ -6942,22 +6942,6 @@ This should be as low as possible, but too low may break functionality</string>
<integer>100</integer>
</array>
</map>
<key>FloaterIMRect</key>
<map>
<key>Comment</key>
<string>Rectangle for IM window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>160</integer>
<integer>500</integer>
<integer>0</integer>
</array>
</map>
<key>FloaterInspectRect</key>
<map>
<key>Comment</key>

6
indra/newview/llagent.cpp
View File

@@ -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"), "");
}

1
indra/newview/llchatbar.h
View File

@@ -84,7 +84,6 @@ public:
// callbacks
void onClickSay(LLUICtrl* ctrl);
static void onTabClick( void* userdata );
void onInputEditorKeystroke();
static void onInputEditorFocusLost();
static void onInputEditorGainFocus();

28
indra/newview/llimpanel.cpp
View File

@@ -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);

18
indra/newview/llimpanel.h
View File

@@ -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<LLButton> mStartCallBtn;
CachedUICtrl<LLButton> mSendBtn;
CachedUICtrl<LLButton> mMuteBtn;
void disableWhileSessionStarting();
typedef std::map<LLUUID, LLStyleSP> styleMap;
static styleMap mStyleMap;
static std::set<LLFloaterIMPanel*> sFloaterIMPanels;
};

83
indra/newview/llimview.cpp
View File

@@ -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)

21
indra/newview/llimview.h
View File

@@ -41,7 +41,6 @@
class LLFloaterChatterBox;
class LLFloaterIMPanel;
class LLFriendObserver;
class LLIMMgr : public LLSingleton<LLIMMgr>
{
@@ -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<LLHandle<LLFloater> > 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

1
indra/newview/llviewermenu.cpp
View File

@@ -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

2
indra/newview/skins/default/xui/de/floater_im.xml
View File

@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<multi_floater name="im_floater" title="Instant Message"/>

10
indra/newview/skins/default/xui/en-us/floater_im.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater bottom="-690" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" follows="left|bottom" height="422"
left="294" min_height="130" min_width="350" mouse_opaque="true"
name="im_floater" rect_control="FloaterIMRect" title="Instant Message"
width="419">
<tab_container border="false" bottom="-422" enabled="true" follows="left|top|right|bottom"
height="406" left="1" mouse_opaque="false" name="Preview Tabs"
tab_position="bottom" width="417" />
</multi_floater>

45
indra/newview/skins/default/xui/es/floater_im.xml
View File

@@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater name="im_floater" title="Mensaje Instantáneo">
<string name="only_user_message">
Eres el único usuario en la sesión.
</string>
<string name="offline_message">
[NAME] está fuera de línea.
</string>
<string name="invite_message">
Pulsa el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
</string>
<string name="muted_message">
Has ignorado a este residente. Al enviarle un mensaje, automáticamente dejarás de ignorarle.
</string>
<string name="generic_request_error">
Error al hacer lo solicitado; por favor, inténtalo más tarde.
</string>
<string name="insufficient_perms_error">
No tienes los permisos suficientes.
</string>
<string name="session_does_not_exist_error">
La sesión ya acabó
</string>
<string name="no_ability_error">
No tienes esa capacidad.
</string>
<string name="not_a_mod_error">
No eres un moderador de la sesión.
</string>
<string name="muted_error">
Un moderador del grupo ha desactivado tu chat de texto.
</string>
<string name="add_session_event">
No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
</string>
<string name="message_session_event">
No se ha podido enviar tu mensaje a la sesión de chat con [RECIPIENT].
</string>
<string name="removed_from_group">
Has sido expulsado del grupo.
</string>
<string name="close_on_no_ability">
Ya no tendrás más la capacidad de estar en la sesión de chat.
</string>
</multi_floater>

45
indra/newview/skins/default/xui/fr/floater_im.xml
View File

@@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater name="im_floater" title="Message instantané">
<string name="only_user_message">
Vous êtes le (la) seul(e) participant à cette session, zut alors!
</string>
<string name="offline_message">
[NAME] is offline
</string>
<string name="invite_message">
Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME].
</string>
<string name="muted_message">
Vous ignorez ce résident (mute). Si vous lui envoyez un message, il ne sera plus ignoré.
</string>
<string name="generic_request_error">
Erreur lors de la requête, veuillez réessayer ultérieurement.
</string>
<string name="insufficient_perms_error">
Vous n'avez pas les droits requis.
</string>
<string name="session_does_not_exist_error">
La session a expiré
</string>
<string name="no_ability_error">
Vous n'avez pas ce pouvoir.
</string>
<string name="not_a_mod_error">
Vous n'êtes pas modérateur(trice) de cette session.
</string>
<string name="muted_error">
Un modérateur de groupe a désactivé votre chat écrit.
</string>
<string name="add_session_event">
Impossible d'ajouter des participants à la session de chat avec [RECIPIENT].
</string>
<string name="message_session_event">
Impossible d'envoyer votre message à la session de chat avec [RECIPIENT].
</string>
<string name="removed_from_group">
Vous avez été supprimé(e) du groupe.
</string>
<string name="close_on_no_ability">
Vous ne pouvez plus participer à la session de chat.
</string>
</multi_floater>

45
indra/newview/skins/default/xui/pt/floater_im.xml
View File

@@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<multi_floater name="im_floater" title="Mensagem Instantânea">
<string name="only_user_message">
Você é o único usuário desta sessão.
</string>
<string name="offline_message">
[FIRST] [LAST] está offline.
</string>
<string name="invite_message">
Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
</string>
<string name="muted_message">
Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente.
</string>
<string name="generic_request_error">
Erro na requisição, por favor, tente novamente.
</string>
<string name="insufficient_perms_error">
Você não tem permissões suficientes.
</string>
<string name="session_does_not_exist_error">
A sessão deixou de existir
</string>
<string name="no_ability_error">
Você não possui esta habilidade.
</string>
<string name="not_a_mod_error">
Você não é um moderador de sessão.
</string>
<string name="muted_error">
Um moderador do grupo desabilitou seu bate-papo em texto.
</string>
<string name="add_session_event">
Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
</string>
<string name="message_session_event">
Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
</string>
<string name="removed_from_group">
Você foi removido do grupo.
</string>
<string name="close_on_no_ability">
Você não possui mais a habilidade de estar na sessão de bate-papo.
</string>
</multi_floater>