livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fixes in lggcontactsetsfloater.cpp and llnotificationstorage.cpp

meow-7.2.2
Ansariel 2013-06-29 00:14:39 +02:00
parent 7ed4535803
commit 09c39ddead
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/lggcontactsetsfloater.cpp
View File

@ -1865,7 +1865,7 @@ void lggContactSetsFloater::draw()
switch (sPhoenixNameSystem())
{
case 0 : fullname = avatar_name.getLegacyName(); break;
case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 2 : fullname = avatar_name.getDisplayName(); break;
default : fullname = avatar_name.getCompleteName(); break;
}
@ -2234,7 +2234,7 @@ BOOL lggContactSetsFloater::compareAv(LLUUID av1, LLUUID av2)
switch (sPhoenixNameSystem())
{
case 0 : fullname = avatar_name.getLegacyName(); break;
case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 2 : fullname = avatar_name.getDisplayName(); break;
default : fullname = avatar_name.getCompleteName(); break;
}
@ -2247,7 +2247,7 @@ BOOL lggContactSetsFloater::compareAv(LLUUID av1, LLUUID av2)
switch (sPhoenixNameSystem())
{
case 0 : fullname = avatar_name.getLegacyName(); break;
case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 2 : fullname = avatar_name.getDisplayName(); break;
default : fullname = avatar_name.getCompleteName(); break;
}
@ -2329,7 +2329,7 @@ BOOL lggContactSetsFloater::generateCurrentList()
switch (sPhoenixNameSystem())
{
case 0 : fullname = avatar_name.getLegacyName(); break;
case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 1 : fullname = (avatar_name.isDisplayNameDefault() ? avatar_name.getDisplayName() : avatar_name.getCompleteName()); break;
case 2 : fullname = avatar_name.getDisplayName(); break;
default : fullname = avatar_name.getCompleteName(); break;
}

5
indra/newview/llnotificationstorage.cpp
View File

@ -40,7 +40,6 @@
#include "llsingleton.h"
#include "llregistry.h"
#include "llviewermessage.h"
#include "llsyswellwindow.h"
typedef boost::function<LLNotificationResponderInterface * (const LLSD& pParams)> responder_constructor_t;
@ -105,8 +104,6 @@ bool LLNotificationStorage::writeNotifications(const LLSD& pNotificationData) co
}
bool LLNotificationStorage::readNotifications(LLSD& pNotificationData) const
LLNotificationWellWindow::getInstance()->lockWindowUpdate();
{
LL_INFOS("LLNotificationStorage") << "starting read '" << mFileName << "'" << LL_ENDL;
@ -129,8 +126,6 @@ bool LLNotificationStorage::readNotifications(LLSD& pNotificationData) const
LL_WARNS("LLNotificationStorage") << "Failed to parse open notifications from file '" << mFileName
<< "'" << LL_ENDL;
}
LLNotificationWellWindow::getInstance()->unlockWindowUpdate();
}
LL_INFOS("LLNotificationStorage") << "ending read '" << mFileName << "'" << LL_ENDL;