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

Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2009-12-25 13:18:20 +02:00
parent 36a9e88158 0d0f10441b
commit 7eea562e8a
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llimview.cpp
View File

@ -1482,13 +1482,17 @@ LLCallDialog(payload)
}
}
void LLOutgoingCallDialog::draw()
void LLCallDialog::draw()
{
if (lifetimeHasExpired())
{
onLifetimeExpired();
}
LLDockableFloater::draw();
if (getDockControl() != NULL)
{
LLDockableFloater::draw();
}
}
bool LLOutgoingCallDialog::lifetimeHasExpired()
@ -1633,14 +1637,6 @@ LLIncomingCallDialog::LLIncomingCallDialog(const LLSD& payload) :
LLCallDialog(payload)
{
}
void LLIncomingCallDialog::draw()
{
if (lifetimeHasExpired())
{
onLifetimeExpired();
}
LLDockableFloater::draw();
}
bool LLIncomingCallDialog::lifetimeHasExpired()
{

9
indra/newview/llimview.h
View File

@ -488,6 +488,9 @@ public:
virtual BOOL postBuild();
// check timer state
/*virtual*/ void draw();
protected:
// lifetime timer for a notification
LLTimer mLifetimeTimer;
@ -509,9 +512,6 @@ public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
// check timer state
/*virtual*/ void draw();
static void onAccept(void* user_data);
static void onReject(void* user_data);
static void onStartIM(void* user_data);
@ -533,9 +533,6 @@ public:
static void onCancel(void* user_data);
static const LLUUID OCD_KEY;
// check timer state
/*virtual*/ void draw();
private:
// hide all text boxes
void hideAllText();