Merge Firestorm LGPL

Thu, 12 Apr 2018 21:08:02 +0200

author
Ansariel
date
Thu, 12 Apr 2018 21:08:02 +0200
changeset 55092
99a950ce3bf6
parent 55091
5159e3f3817e
parent 55038
fd5bea6797a2
child 55097
5b383f623170

Merge Firestorm LGPL

     1.1 --- a/indra/cmake/00-Common.cmake	Sat Apr 07 15:01:39 2018 +0200
     1.2 +++ b/indra/cmake/00-Common.cmake	Thu Apr 12 21:08:02 2018 +0200
     1.3 @@ -157,11 +157,9 @@
     1.4    if ( ${FORTIFY_SOURCE_RES} EQUAL 0 )
     1.5     add_definitions(-D_FORTIFY_SOURCE=2)
     1.6    endif()
     1.7 -  set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-unused-but-set-variable -Wno-unused-variable -Wno-placement-new ${CMAKE_CXX_FLAGS}")
     1.8  
     1.9    # gcc 4.3 and above don't like the LL boost and also
    1.10    # cause warnings due to our use of deprecated headers
    1.11 -  add_definitions(-Wno-parentheses)
    1.12  
    1.13    add_definitions(
    1.14        -D_REENTRANT
    1.15 @@ -176,18 +174,9 @@
    1.16        -pthread
    1.17        )
    1.18  
    1.19 -  # <FS:ND> Enable C++11 support + gnu extensions
    1.20 -  add_definitions(-std=gnu++11)
    1.21 -  # </FS:ND>
    1.22 -
    1.23 -  # <FS:ND> Enable old C++ ABI
    1.24 -  add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
    1.25 -  # </FS:ND>
    1.26 -
    1.27    # force this platform to accept TOS via external browser <FS:ND> No, do not.
    1.28    # add_definitions(-DEXTERNAL_TOS)
    1.29  
    1.30 -
    1.31    add_definitions(-DAPPID=secondlife)
    1.32    add_compile_options(-fvisibility=hidden)
    1.33    # don't catch SIGCHLD in our base application class for the viewer - some of
     2.1 --- a/indra/llui/llurlentry.cpp	Sat Apr 07 15:01:39 2018 +0200
     2.2 +++ b/indra/llui/llurlentry.cpp	Thu Apr 12 21:08:02 2018 +0200
     2.3 @@ -350,7 +350,7 @@
     2.4  {
     2.5  	// <FS:Ansariel> Inworldz special
     2.6  	//mPattern = boost::regex("(http://(maps.secondlife.com|slurl.com)/secondlife/|secondlife://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     2.7 -	mPattern = boost::regex("(http://(maps.secondlife.com|slurl.com)/secondlife/|(secondlife|inworldz|iw)://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     2.8 +	mPattern = boost::regex("(https?://(maps.secondlife.com|slurl.com)/secondlife/|(secondlife|inworldz|iw)://(/app/(worldmap|teleport)/)?)[^ /]+(/-?[0-9]+){1,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
     2.9  									boost::regex::perl|boost::regex::icase);
    2.10  	mMenuName = "menu_url_http.xml";
    2.11  	mTooltip = LLTrans::getString("TooltipHttpUrl");
    2.12 @@ -437,7 +437,7 @@
    2.13  LLUrlEntrySLURL::LLUrlEntrySLURL()
    2.14  {
    2.15  	// see http://slurl.com/about.php for details on the SLURL format
    2.16 -	mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/[^ /]+(/\\d+){0,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
    2.17 +	mPattern = boost::regex("https?://(maps.secondlife.com|slurl.com)/secondlife/[^ /]+(/\\d+){0,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?",
    2.18  							boost::regex::perl|boost::regex::icase);
    2.19  	mMenuName = "menu_url_slurl.xml";
    2.20  	mTooltip = LLTrans::getString("TooltipSLURL");
     3.1 --- a/indra/newview/llpanelmaininventory.cpp	Sat Apr 07 15:01:39 2018 +0200
     3.2 +++ b/indra/newview/llpanelmaininventory.cpp	Thu Apr 12 21:08:02 2018 +0200
     3.3 @@ -1090,7 +1090,7 @@
     3.4  	}
     3.5  	
     3.6      mCounterCtrl->setValue(text);
     3.7 -    mCounterCtrl->setToolTip(text);
     3.8 +    //mCounterCtrl->setToolTip(text); // <FS:Ansariel> Include folders in inventory count
     3.9  }
    3.10  
    3.11  void LLPanelMainInventory::onFocusReceived()

mercurial