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

oops, announce function removed

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-10 17:24:42 -03:00
parent 53df671ca8
commit 4df86ae786
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llfloateravatarlist.cpp
View File

@@ -68,12 +68,6 @@ typedef enum e_radar_alert_type
ALERT_TYPE_CHATRANGE = 3 ALERT_TYPE_CHATRANGE = 3
} ERadarAlertType; } ERadarAlertType;
void announce(std::string msg)
{
LLChat chat(msg);
LLFloaterChat::addChat(chat);
}
void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering) void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering)
{ {
if (gSavedSettings.getBOOL("RadarChatAlerts")) if (gSavedSettings.getBOOL("RadarChatAlerts"))
@@ -112,10 +106,6 @@ void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool
LLFloaterChat::addChat(chat); LLFloaterChat::addChat(chat);
} }
} }
if (type == ALERT_TYPE_SIM && entering && gSavedSettings.getBOOL("RadarChatKeys"))
{
announce(key.asString());
}
} }
LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name, const LLVector3d &position) : LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name, const LLVector3d &position) :
@@ -1043,20 +1033,7 @@ void LLFloaterAvatarList::onClickGetKey(void *userdata)
void LLFloaterAvatarList::onClickSendKeys(void *userdata) void LLFloaterAvatarList::onClickSendKeys(void *userdata)
{ {
LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata; //TODO remove
std::map<LLUUID, LLAvatarListEntry>::iterator iter;
LLAvatarListEntry *entry;
if (self->mAvatars.size() == 0)
return;
for (iter = self->mAvatars.begin(); iter != self->mAvatars.end(); iter++)
{
entry = &iter->second;
if (!entry->isDead() && entry->isInSim())
announce(entry->getID().asString());
}
} }
static void send_freeze(const LLUUID& avatar_id, bool freeze) static void send_freeze(const LLUUID& avatar_id, bool freeze)