summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-07-26 15:38:53 -0700
committerRichard Nelson <richard@lindenlab.com>2011-07-26 15:38:53 -0700
commit6bcb677c902215e1c9cc3267963e214ca6f9add9 (patch)
tree0d22a19700b272380f9f92ef9b83b390ae869e0c /indra/newview/llviewerwindow.h
parentdf82fbffa29428af258dc84ce2acbb07180f557e (diff)
parent2c2a4c123eb9bfa80785e5509e73c8f7f236228f (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r--indra/newview/llviewerwindow.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index ff49ed1f62..edd241a742 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -272,6 +272,7 @@ public:
void setProgressCancelButtonVisible( BOOL b, const std::string& label = LLStringUtil::null );
LLProgressView *getProgressView() const;
void revealIntroPanel();
+ void setStartupComplete();
void updateObjectUnderCursor();