QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
index b7aaa2e05a..293f5223c5 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="script search" title="Script Search">

-	<check_box label="Não diferenciar Maiusculas de Minusculas" name="case_text" />

-	<button label="Buscar" label_selected="Buscar" name="search_btn" />

-	<button label="Substituir" label_selected="Substituir" name="replace_btn" />

-	<button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn" />

-	<text type="string" length="1" name="txt">

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="script search" title="Busca de Script">

+	<check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text"/>

+	<button label="Buscar" label_selected="Buscar" name="search_btn"/>

+	<button label="Substituir" label_selected="Substituir" name="replace_btn"/>

+	<button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn"/>

+	<text length="1" name="txt" type="string">

 		Buscar

 	</text>

-	<text type="string" length="1" name="txt2">

+	<text length="1" name="txt2" type="string">

 		Substituir

 	</text>

 </floater>