Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

3 files changed, 11 insertions, 45 deletions

diff --git a/indra/test_apps/llfbconnecttest/CMakeLists.txt b/indra/test_apps/llfbconnecttest/CMakeLists.txt
index 512bf202ae..25aaebb783 100644
--- a/indra/test_apps/llfbconnecttest/CMakeLists.txt
+++ b/indra/test_apps/llfbconnecttest/CMakeLists.txt
@@ -109,27 +109,27 @@ else (DARWIN)
   )
 endif (DARWIN)
 
-get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
+set(BUILT_SLPLUGIN $<TARGET_FILE:SLPlugin>)
 add_custom_command(TARGET llfbconnecttest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_SLPLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_SLPLUGIN}
 )
 
-get_target_property(BUILT_LLCOMMON llcommon LOCATION)
+set(BUILT_LLCOMMON $<TARGET_FILE:llcommon>)
 add_custom_command(TARGET llfbconnecttest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_LLCOMMON}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_LLCOMMON}
 )
 
 
-get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
+set(BUILT_WEBKIT_PLUGIN $<TARGET_FILE:media_plugin_webkit>)
 add_custom_command(TARGET llfbconnecttest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_WEBKIT_PLUGIN}
 )
 
 # copy over bookmarks file if llfbconnecttest gets built
-get_target_property(BUILT_LLFBCONNECTTEST llfbconnecttest LOCATION)
+set(BUILT_LLFBCONNECTTEST $<TARGET_FILE:llfbconnecttest>)
 add_custom_command(TARGET llfbconnecttest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
   DEPENDS ${BUILT_LLFBCONNECTTEST}
diff --git a/indra/test_apps/llfbconnecttest/llfbconnecttest.h b/indra/test_apps/llfbconnecttest/llfbconnecttest.h
index 6f442a55b3..77e4d096d0 100644
--- a/indra/test_apps/llfbconnecttest/llfbconnecttest.h
+++ b/indra/test_apps/llfbconnecttest/llfbconnecttest.h
@@ -144,43 +144,14 @@ class LLFBConnectTest : public LLPluginClassMediaOwner
 
 		float mDistanceCameraToSelectedGeometry;
 
-		int mIdControlAddPanel;
-		int mIdControlRemPanel;
-
 		std::vector< std::pair< std::string, std::string > > mBookmarks;
 		GLUI_Listbox* mBookmarkList;
 		int mIdBookmarks;
 		int mIdUrlEdit;
 		GLUI_EditText* mUrlEdit;
-        //int mIdUrlInitHistoryEdit;
-		//GLUI_EditText* mUrlInitHistoryEdit;
 		int mSelBookmark;
-		//int mIdRandomPanelCount;
-		//int mRandomPanelCount;
-		//int mIdRandomBookmarks;
-		//int mRandomBookmarks;
-		//int mIdDisableTimeout;
-		//int mDisableTimeout;
-		//int mIdUsePluginReadThread;
-		//int mUsePluginReadThread;
-		//int mIdLargePanelSpacing;
-		//int mLargePanelSpacing;
-		//int mIdControlCrashPlugin;
-		//int mIdControlHangPlugin;
-		int mIdControlExitApp;
 
-		//GLUI* mGluiMediaTimeControlWindow;
-		//int mIdMediaTimeControlPlay;
-		//int mIdMediaTimeControlLoop;
-		//int mIdMediaTimeControlPause;
-		//int mIdMediaTimeControlStop;
-		//int mIdMediaTimeControlSeek;
-		//int mIdMediaTimeControlVolume;
-		//int mMediaTimeControlVolume;
-		//int mIdMediaTimeControlSeekSeconds;
-		//int mMediaTimeControlSeekSeconds;
-		//int mIdMediaTimeControlRewind;
-		//int mIdMediaTimeControlFastForward;
+		int mIdControlExitApp;
 
 		GLUI* mGluiMediaBrowserControlWindow;
 		int mIdMediaBrowserControlBack;
@@ -188,16 +159,11 @@ class LLFBConnectTest : public LLPluginClassMediaOwner
 		int mIdMediaBrowserControlStop;
 		int mIdMediaBrowserControlForward;
 		GLUI_Button* mMediaBrowserControlForwardButton;
-		bool mGluiMediaTimeControlWindowFlag;
 		bool mGluiMediaBrowserControlWindowFlag;
 		bool mMediaBrowserControlBackButtonFlag;
 		bool mMediaBrowserControlForwardButtonFlag;
 		int mIdMediaBrowserControlHome;
 		int mIdMediaBrowserControlReload;
-		int mIdMediaBrowserControlClearCache;
-		int mIdMediaBrowserControlClearCookies;
-		int mIdMediaBrowserControlEnableCookies;
-		int mMediaBrowserControlEnableCookies;
 
 		GLUI* mBottomGLUIWindow;
 		GLUI_StaticText* mStatusText;
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 9d44563e26..0c8bdc464d 100755
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -334,40 +334,40 @@ else (DARWIN)
   )
 endif (DARWIN)
 
-get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
+set(BUILT_SLPLUGIN $<TARGET_FILE:SLPlugin>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_SLPLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_SLPLUGIN}
 )
 
-get_target_property(BUILT_LLCOMMON llcommon LOCATION)
+set(BUILT_LLCOMMON $<TARGET_FILE:llcommon>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_LLCOMMON}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_LLCOMMON}
 )
 
-get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
+set(BUILT_WEBKIT_PLUGIN $<TARGET_FILE:media_plugin_webkit>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_WEBKIT_PLUGIN}
 )
 
 if (DARWIN OR WINDOWS)
-  get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
+  set(BUILT_QUICKTIME_PLUGIN $<TARGET_FILE:media_plugin_quicktime>)
   add_custom_command(TARGET llmediaplugintest POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_QUICKTIME_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
     DEPENDS ${BUILT_QUICKTIME_PLUGIN}
   )
 endif (DARWIN OR WINDOWS)
 
-get_target_property(BUILT_EXAMPLE_PLUGIN media_plugin_example LOCATION)
+set(BUILT_EXAMPLE_PLUGIN $<TARGET_FILE:media_plugin_example>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_EXAMPLE_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
   DEPENDS ${BUILT_EXAMPLE_PLUGIN}
 )
 
 # copy over bookmarks file if llmediaplugintest gets built
-get_target_property(BUILT_LLMEDIAPLUGINTEST llmediaplugintest LOCATION)
+set(BUILT_LLMEDIAPLUGINTEST $<TARGET_FILE:llmediaplugintest>)
 add_custom_command(TARGET llmediaplugintest POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
   DEPENDS ${BUILT_LLMEDIAPLUGINTEST}