From 9b6da49ef5d5673015dea0744bbe1adeb9380f52 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 16 Apr 2010 13:30:51 -0700 Subject: EXT-6895 - Crash in landmarkNameCallback reviewed by Leyla --- indra/newview/llfavoritesbar.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index bf7c735488..959395ff82 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -75,7 +75,9 @@ public: mPosY(0), mPosZ(0), mLoaded(false) - {} + { + mHandle.bind(this); + } void setLandmarkID(const LLUUID& id) { mLandmarkID = id; } const LLUUID& getLandmarkId() const { return mLandmarkID; } @@ -122,17 +124,21 @@ private: if(LLLandmarkActions::getLandmarkGlobalPos(mLandmarkID, g_pos)) { LLLandmarkActions::getRegionNameAndCoordsFromPosGlobal(g_pos, - boost::bind(&LLLandmarkInfoGetter::landmarkNameCallback, this, _1, _2, _3, _4)); + boost::bind(&LLLandmarkInfoGetter::landmarkNameCallback, static_cast >(mHandle), _1, _2, _3, _4)); } } - void landmarkNameCallback(const std::string& name, S32 x, S32 y, S32 z) + static void landmarkNameCallback(LLHandle handle, const std::string& name, S32 x, S32 y, S32 z) { - mPosX = x; - mPosY = y; - mPosZ = z; - mName = name; - mLoaded = true; + LLLandmarkInfoGetter* getter = handle.get(); + if (getter) + { + getter->mPosX = x; + getter->mPosY = y; + getter->mPosZ = z; + getter->mName = name; + getter->mLoaded = true; + } } LLUUID mLandmarkID; @@ -141,6 +147,7 @@ private: S32 mPosY; S32 mPosZ; bool mLoaded; + LLRootHandle mHandle; }; /** -- cgit v1.2.3 From 0758eab5e62897297d6d16feea37df2c84c3aa1a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 16 Apr 2010 14:41:26 -0700 Subject: Backed out changeset: 61a83065d146 --- indra/newview/skins/default/xui/en/panel_status_bar.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 8c7de22cf8..84664eedcc 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -99,7 +99,7 @@ image_pressed="Pause_Press" image_pressed_selected="Play_Press" is_toggle="true" - left_pad="20" + left_pad="15" top="1" name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)" @@ -112,12 +112,12 @@ image_pressed="Audio_Press" image_unselected="Audio_Off" is_toggle="true" - left_pad="10" + left_pad="5" top="2" name="volume_btn" tool_tip="Global Volume Control" width="16" /> - + width="20"/> -- cgit v1.2.3 From 5a5380a65e05db01ef0fa416d098d600f3da41fc Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Tue, 6 Apr 2010 20:28:29 +0300 Subject: Fixed major bug EXT-6572 (EXT-6572 ([VARIABLE IN WRONG PLACE] in Taskbar \"Kaufen L$\" should be \"L$ kaufen\") - Removed the L$ graphic and made \"L$\" part of the label string. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/172/ (transplanted from 4cbdcfc8b196f0ff28df1d0897023ee967cce2a3) --- indra/newview/skins/default/xui/en/panel_status_bar.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 84664eedcc..690d2971ee 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -62,11 +62,11 @@ halign="right" font="SansSerifSmall" follows="right|top" - image_selected="BuyArrow_Over" - image_unselected="BuyArrow_Over" - image_pressed="BuyArrow_Press" + image_selected="spacer35.tga" + image_unselected="spacer35.tga" + image_pressed="spacer35.tga" height="16" - label="Buy" + label="Buy L$" label_color="EmphasisColor" left_pad="0" label_shadow="false" -- cgit v1.2.3 From afea42507cd909ebf7f456ec04bfada9d09bf970 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Fri, 16 Apr 2010 16:26:20 -0700 Subject: EXT-6880 Building updater with static linked CRT --- indra/win_updater/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt index 82347adf20..69ec7a1e49 100644 --- a/indra/win_updater/CMakeLists.txt +++ b/indra/win_updater/CMakeLists.txt @@ -6,6 +6,13 @@ include(00-Common) include(LLCommon) include(Linking) +# *HACK - override msvcrt implementation (intialized on 00-Common) to be +# statically linked for the installer this relies on vc taking the last flag on +# the command line +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT") + include_directories( ${LLCOMMON_INCLUDE_DIRS} ) @@ -30,8 +37,8 @@ target_link_libraries(windows-updater set_target_properties(windows-updater PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:LIBCMT" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\"" + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;MSVCRT\"" ) # The windows-updater doesn't link against anything non-system, apparently -- cgit v1.2.3 From 69c3caa24f8d4edb28892b384946fa0f82d2baf4 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Fri, 16 Apr 2010 16:38:16 -0700 Subject: EXT-6880 Adding newline to end of CMakesList.txt --- indra/win_updater/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/win_updater/CMakeLists.txt b/indra/win_updater/CMakeLists.txt index 69ec7a1e49..210486c668 100644 --- a/indra/win_updater/CMakeLists.txt +++ b/indra/win_updater/CMakeLists.txt @@ -42,4 +42,4 @@ set_target_properties(windows-updater ) # The windows-updater doesn't link against anything non-system, apparently -#ll_deploy_sharedlibs_command(windows-updater) \ No newline at end of file +#ll_deploy_sharedlibs_command(windows-updater) -- cgit v1.2.3 From eea0ba834b900588d03d109c93a1bb756dbce2fb Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 16 Apr 2010 16:54:07 -0700 Subject: EXT-6572 correct translation for "Buy L$", for 2.0.1 --- indra/newview/skins/default/xui/da/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/de/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/es/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/fr/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/it/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/ja/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/pl/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/pt/panel_status_bar.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'indra') diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml index 4618fe536d..08ffafd5a6 100644 --- a/indra/newview/skins/default/xui/da/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml @@ -22,7 +22,7 @@ L$ [AMT]