diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterpostcard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp index 47f59a6..b140b1c 100644 --- a/linden/indra/newview/llfloaterpostcard.cpp +++ b/linden/indra/newview/llfloaterpostcard.cpp | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "llbutton.h" | 46 | #include "llbutton.h" |
47 | #include "llviewercontrol.h" | 47 | #include "llviewercontrol.h" |
48 | #include "llviewernetwork.h" | 48 | #include "llviewernetwork.h" |
49 | #include "llvieweruictrlfactory.h" | 49 | #include "lluictrlfactory.h" |
50 | #include "lluploaddialog.h" | 50 | #include "lluploaddialog.h" |
51 | #include "llviewerstats.h" | 51 | #include "llviewerstats.h" |
52 | #include "llviewerwindow.h" | 52 | #include "llviewerwindow.h" |
@@ -119,7 +119,7 @@ BOOL LLFloaterPostcard::postBuild() | |||
119 | gAgent.buildFullname(name_string); | 119 | gAgent.buildFullname(name_string); |
120 | childSetValue("name_form", LLSD(name_string)); | 120 | childSetValue("name_form", LLSD(name_string)); |
121 | 121 | ||
122 | LLTextEditor* MsgField = LLUICtrlFactory::getTextEditorByName(this, "msg_form"); | 122 | LLTextEditor* MsgField = getChild<LLTextEditor>("msg_form"); |
123 | if (MsgField) | 123 | if (MsgField) |
124 | { | 124 | { |
125 | MsgField->setWordWrap(TRUE); | 125 | MsgField->setWordWrap(TRUE); |
@@ -142,7 +142,7 @@ LLFloaterPostcard* LLFloaterPostcard::showFromSnapshot(LLImageJPEG *jpeg, LLImag | |||
142 | // It's now our job to clean them up | 142 | // It's now our job to clean them up |
143 | LLFloaterPostcard *instance = new LLFloaterPostcard(jpeg, img, image_scale, pos_taken_global); | 143 | LLFloaterPostcard *instance = new LLFloaterPostcard(jpeg, img, image_scale, pos_taken_global); |
144 | 144 | ||
145 | gUICtrlFactory->buildFloater(instance, "floater_postcard.xml"); | 145 | LLUICtrlFactory::getInstance()->buildFloater(instance, "floater_postcard.xml"); |
146 | 146 | ||
147 | S32 left, top; | 147 | S32 left, top; |
148 | gFloaterView->getNewFloaterPosition(&left, &top); | 148 | gFloaterView->getNewFloaterPosition(&left, &top); |
@@ -158,7 +158,7 @@ void LLFloaterPostcard::draw() | |||
158 | LLGLSUIDefault gls_ui; | 158 | LLGLSUIDefault gls_ui; |
159 | LLFloater::draw(); | 159 | LLFloater::draw(); |
160 | 160 | ||
161 | if(getVisible() && !isMinimized() && mViewerImage.notNull() && mJPEGImage.notNull()) | 161 | if(!isMinimized() && mViewerImage.notNull() && mJPEGImage.notNull()) |
162 | { | 162 | { |
163 | LLRect rect(getRect()); | 163 | LLRect rect(getRect()); |
164 | 164 | ||
@@ -332,7 +332,7 @@ void LLFloaterPostcard::onMsgFormFocusRecieved(LLFocusableElement* receiver, voi | |||
332 | LLFloaterPostcard* self = (LLFloaterPostcard *)data; | 332 | LLFloaterPostcard* self = (LLFloaterPostcard *)data; |
333 | if(self) | 333 | if(self) |
334 | { | 334 | { |
335 | LLTextEditor* msgForm = LLUICtrlFactory::getTextEditorByName(self, "msg_form"); | 335 | LLTextEditor* msgForm = self->getChild<LLTextEditor>("msg_form"); |
336 | if(msgForm && msgForm == receiver && msgForm->hasFocus() && !(self->mHasFirstMsgFocus)) | 336 | if(msgForm && msgForm == receiver && msgForm->hasFocus() && !(self->mHasFirstMsgFocus)) |
337 | { | 337 | { |
338 | self->mHasFirstMsgFocus = true; | 338 | self->mHasFirstMsgFocus = true; |