merge

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
index 4c955e875a..febce9bcb7 100644
--- a/indra/llplugin/slplugin/slplugin.cpp
+++ b/indra/llplugin/slplugin/slplugin.cpp
@@ -286,7 +286,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 };
@@ -312,7 +312,7 @@ int main(int argc, char **argv)
 					}
 				}
 								
-				if((FrontWindow() != NULL) && (front_window == NULL))
+				if((ActiveNonFloatingWindow() != NULL) && (front_window == NULL))
 				{
 					// Opening the first window
 					
@@ -324,7 +324,7 @@ int main(int argc, char **argv)
 
 					if(layer_group)
 					{
-						SetWindowGroup(FrontWindow(), layer_group);
+						SetWindowGroup(ActiveNonFloatingWindow(), layer_group);
 					}
 					
 					if(parent_is_front_process)
@@ -333,9 +333,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
 					
@@ -355,7 +355,7 @@ int main(int argc, char **argv)
 					window_hack_state = 2;
 				}
 
-				front_window = FrontWindow();
+				front_window = ActiveNonFloatingWindow();
 
 			}
 		}