diff options
author | Dave Parks <davep@lindenlab.com> | 2010-04-26 21:33:18 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-04-26 21:33:18 -0500 |
commit | c0a2a44a44c5d6db39cfa5fdb5630578d4c2d267 (patch) | |
tree | bbdc2df6ac5250eefae19dbdbc60cb38130d3785 /indra | |
parent | 809b6879e1d89ff3bc565f3144e4cb625ccdd185 (diff) |
Fix for mac build.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llplugin/slplugin/slplugin.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp index 7d6dde1a58..b989e321f1 100644 --- a/indra/llplugin/slplugin/slplugin.cpp +++ b/indra/llplugin/slplugin/slplugin.cpp @@ -273,7 +273,7 @@ int main(int argc, char **argv) } // Check for a change in this process's frontmost window. - if(FrontWindow() != front_window) + if(ActiveNonFloatingWindow() != front_window) { ProcessSerialNumber self = { 0, kCurrentProcess }; ProcessSerialNumber parent = { 0, kNoProcess }; @@ -299,7 +299,7 @@ int main(int argc, char **argv) } } - if((FrontWindow() != NULL) && (front_window == NULL)) + if((ActiveNonFloatingWindow() != NULL) && (front_window == NULL)) { // Opening the first window @@ -311,7 +311,7 @@ int main(int argc, char **argv) if(layer_group) { - SetWindowGroup(FrontWindow(), layer_group); + SetWindowGroup(ActiveNonFloatingWindow(), layer_group); } if(parent_is_front_process) @@ -320,9 +320,9 @@ int main(int argc, char **argv) (void) SetFrontProcess( &self ); } - ActivateWindow(FrontWindow(), true); + ActivateWindow(ActiveNonFloatingWindow(), true); } - else if((FrontWindow() == NULL) && (front_window != NULL)) + else if((ActiveNonFloatingWindow() == NULL) && (front_window != NULL)) { // Closing the last window @@ -342,7 +342,7 @@ int main(int argc, char **argv) window_hack_state = 2; } - front_window = FrontWindow(); + front_window = ActiveNonFloatingWindow(); } } |