summaryrefslogtreecommitdiff
path: root/indra/newview/lldirpicker.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-11 22:49:47 -0700
committerRichard Linden <none@none>2011-10-11 22:49:47 -0700
commitbb93dc154afe5fbed4dfa187ed6297d5714bdb5f (patch)
treefeabec8ea1beef33da013ee01c9b73966b7b0771 /indra/newview/lldirpicker.cpp
parentf9e900f5ac9002f5ef3b44b02ac300971288e89b (diff)
parentd0cda13235079c6626ebc7bbe4de542784d50fa0 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
-rw-r--r--indra/newview/lldirpicker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index dd243397a1..1e03582a29 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -217,12 +217,12 @@ OSStatus LLDirPicker::doNavChooseDialog()
error = NavCreateChooseFolderDialog(&mNavOptions, &doNavCallbackEvent, NULL, NULL, &navRef);
- gViewerWindow->mWindow->beforeDialog();
+ gViewerWindow->getWindow()->beforeDialog();
if (error == noErr)
error = NavDialogRun(navRef);
- gViewerWindow->mWindow->afterDialog();
+ gViewerWindow->getWindow()->afterDialog();
if (error == noErr)
error = NavDialogGetReply(navRef, &navReply);