Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer

indra/llmath/llcalcparser.h

@@ -41,7 +41,7 @@ namespace expression {
 
 
 //TODO: If we can find a better way to do this with boost::pheonix::bind lets do it
-namespace { // anonymous
+//namespace { // anonymous
 
 template <typename T>
 T min_glue(T a, T b)
@@ -91,7 +91,7 @@ struct lazy_bfunc_
 	}
 };
  
-} // end namespace anonymous
+//} // end namespace anonymous
  
 template <typename FPT, typename Iterator>
 struct grammar

indra/newview/llfloatercustomize.cpp

@@ -189,6 +189,7 @@ LLFloaterCustomize::~LLFloaterCustomize()
 BOOL LLFloaterCustomize::postBuild()
 {
 	getChild<LLUICtrl>("Make Outfit")->setCommitCallback(boost::bind(&LLFloaterCustomize::onBtnMakeOutfit, this));
+	getChild<LLUICtrl>("Save Outfit")->setCommitCallback(boost::bind(&LLAppearanceMgr::updateBaseOutfit, LLAppearanceMgr::getInstance()));
 	getChild<LLUICtrl>("Ok")->setCommitCallback(boost::bind(&LLFloaterCustomize::onBtnOk, this));
 	getChild<LLUICtrl>("Cancel")->setCommitCallback(boost::bind(&LLFloater::onClickClose, this));
 

indra/newview/llinventoryactions.cpp

@@ -31,11 +31,14 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+
 #include "llagentwearables.h"
+#include "llappearancemgr.h"
+#include "llfoldervieweventlistener.h"
 #include "llimview.h"
-#include "llinventoryfunctions.h"
 #include "llinventorybridge.h"
 #include "llinventoryclipboard.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
 #include "llinventorypanel.h"
 #include "llmakeoutfitdialog.h"
@@ -43,7 +46,6 @@
 #include "llpanelmaininventory.h"
 #include "llpanelobjectinventory.h"
 #include "llpreview.h" // For LLMultiPreview
-#include "llfoldervieweventlistener.h"
 #include "lltrans.h"
 #include "llvoavatarself.h"
 
@@ -317,7 +319,7 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, std::string type,
 							LLInventoryType::IT_GESTURE,
 							PERM_ALL);
 	}
-	else if ("outfit" == type)
+	else if ("outfit" == type || ("update outfit" == type && !LLAppearanceMgr::getInstance()->updateBaseOutfit())) // If updateBaseOutfit fails, prompt to make a new outfit
 	{
 		new LLMakeOutfitDialog(false);
 		return;

indra/newview/llpanelface.cpp

@@ -491,7 +491,7 @@ void LLPanelFace::sendTextureInfo()
 				return (object->mDrawable) ? object->mDrawable->getFace(te): NULL;
 			}
 		} get_last_face_func;
-		LLFace* last_face;
+		LLFace* last_face(NULL);
 		LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_last_face_func, last_face);
 
 		LLPanelFaceSetAlignedTEFunctor setfunc(this, last_face);
@@ -654,7 +654,7 @@ void LLPanelFace::getState()
 						return (object->mDrawable) ? object->mDrawable->getFace(te): NULL;
 					}
 				} get_te_face_func;
-				LLFace* last_face;
+				LLFace* last_face(NULL);
 				LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_te_face_func, last_face);
 				LLPanelFaceGetIsAlignedTEFunctor get_is_aligend_func(last_face);
 				// this will determine if the texture param controls are tentative:

indra/newview/skins/default/xui/en-us/floater_customize.xml

@@ -1449,4 +1449,5 @@ one from scratch and wear it.
 	     height="20" label="Make Outfit..." label_selected="Make Outfit..."
 	     mouse_opaque="true" name="Make Outfit" left="10" scale_image="true"
 	     width="100" />
+    <button bottom="-536" follows="left|bottom" height="20" left="110" width="100" name="Save Outfit" label="Save Outfit"/>
 </floater>

indra/newview/skins/default/xui/en-us/floater_inventory.xml

@@ -72,6 +72,9 @@
 			     name="Open" width="128">
 				<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
 			</menu_item_call>
+			<menu_item_call label="Update Outfit" mouse_opaque="true" name="Update Outfit">
+				<on_click filter="" function="Inventory.DoCreate" userdata="update outfit"/>
+			</menu_item_call>
 			<menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
 			     width="128" />
 			<menu_item_call bottom_delta="-18" height="18" label="New Window" left="0" mouse_opaque="true"

indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml

@@ -49,6 +49,10 @@
             <on_click function="Object.ScriptCount" />
             <on_visible function="Object.VisibleScriptCount" />
           </menu_item_call>
+          <menu_item_call label="Script Info" mouse_opaque="true" name="Script Info">
+            <on_click function="ShowFloater" userdata="script info" />
+            <on_visible function="Self.VisibleScriptInfo" />
+          </menu_item_call>
         </pie_menu>
 		<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
 			<on_click function="Object.Inspect" />

indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml

@@ -30,7 +30,7 @@
   <!-- Buttons -->
   <button label="Delete" label_selected="Delete" enabled="true" name="btn_delete"
 		height="18" width="75" left="120" bottom_delta="-27"
-		halign="center" tool_type="Delete the selected grid from the list"
+		halign="center" tool_tip="Delete the selected grid from the list"
 		follows="left|top" scale_image="true"
 	    font="SansSerifSmall" mouse_opaque="true" />
   <button label="Create" label_selected="Add" enabled="true" name="btn_add"

indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml

@@ -11,9 +11,9 @@
       <check_box label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22;" name="allow_mu_pose_check"/>
       <check_box label="Ajoute les fins des commentaires (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
       <check_box label="Montre les changements de display name" tool_tip="" name="display_name_change"/>
-      <check_box label="Le texte ecris d&#xE9;file au dessus de l'avi" name="use_typing_bubbles"/>
+      <check_box label="Signale, au dessus de la t&#xEA;te, que vous &#xE9;crivez" name="use_typing_bubbles"/>
       <text name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
-      <radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
+      <radio_group name="objects_link">
         <radio_item name="no_object">Aucun objet</radio_item>
         <radio_item name="others_objects">Les objets des autres</radio_item>
         <radio_item left_delta="65" name="anyones_objects">Tous les objets</radio_item>