Merge http to lgpl

Mon, 24 Feb 2014 13:57:12 -0800

author
Tank_Master
date
Mon, 24 Feb 2014 13:57:12 -0800
changeset 40763
1a7ed603a70c
parent 40762
0cb378196ad6
parent 40660
1530aaccf20b
child 40764
f25b8b4f3643

Merge http to lgpl

indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
     1.1 --- a/.hgignore	Mon Feb 24 12:37:32 2014 -0800
     1.2 +++ b/.hgignore	Mon Feb 24 13:57:12 2014 -0800
     1.3 @@ -91,3 +91,4 @@
     1.4  glob:fmod*
     1.5  syntax: regexp
     1.6  ^indra/build
     1.7 +.*\.wixobj
     1.8 \ No newline at end of file
     2.1 --- a/indra/cmake/00-Common.cmake	Mon Feb 24 12:37:32 2014 -0800
     2.2 +++ b/indra/cmake/00-Common.cmake	Mon Feb 24 13:57:12 2014 -0800
     2.3 @@ -249,7 +249,7 @@
     2.4      # this stops us requiring a really recent glibc at runtime
     2.5      add_definitions(-fno-stack-protector)
     2.6      # linking can be very memory-hungry, especially the final viewer link
     2.7 -    set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
     2.8 +    set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory -Wl,--build-id")
     2.9    endif (NOT STANDALONE)
    2.10  
    2.11    # <FS:TS> Enable AVX optimizations if requested and at least GCC 4.6.
     3.1 --- a/indra/llprimitive/llprimitive.cpp	Mon Feb 24 12:37:32 2014 -0800
     3.2 +++ b/indra/llprimitive/llprimitive.cpp	Mon Feb 24 13:57:12 2014 -0800
     3.3 @@ -183,7 +183,10 @@
     3.4  {
     3.5  	clearTextureList();
     3.6  	// Cleanup handled by volume manager
     3.7 -	if (mVolumep)
     3.8 +
     3.9 +	// <FS:ND/> During shutdown sVolumeManager can be 0
    3.10 +	//	if (mVolumep)
    3.11 +	if ( mVolumep && sVolumeManager )
    3.12  	{
    3.13  		sVolumeManager->unrefVolume(mVolumep);
    3.14  	}
     4.1 --- a/indra/llui/llfloater.cpp	Mon Feb 24 12:37:32 2014 -0800
     4.2 +++ b/indra/llui/llfloater.cpp	Mon Feb 24 13:57:12 2014 -0800
     4.3 @@ -1414,7 +1414,11 @@
     4.4  	if (b)
     4.5  	{
     4.6  		// only push focused floaters to front of stack if not in midst of ctrl-tab cycle
     4.7 -		if (!getHost() && !((LLFloaterView*)getParent())->getCycleMode())
     4.8 +
     4.9 +		// <FS:ND/> Don't use C-cast to cast between objects.
    4.10 +		// if (!getHost() && !((LLFloaterView*)getParent())->getCycleMode())
    4.11 +		LLFloaterView *pParent = dynamic_cast<LLFloaterView*>(getParent());
    4.12 +		if (!getHost() && pParent && !pParent->getCycleMode() )
    4.13  		{
    4.14  			if (!isFrontmost())
    4.15  			{
    4.16 @@ -1684,7 +1688,10 @@
    4.17  		}
    4.18  		else
    4.19  		{
    4.20 -			LLFloaterView* parent = (LLFloaterView*) getParent();
    4.21 +			// <FS:ND/> Don't use C-cast to cast between objects.
    4.22 +			// LLFloaterView* parent = (LLFloaterView*) getParent();
    4.23 +			LLFloaterView* parent = dynamic_cast<LLFloaterView*>( getParent() );
    4.24 +
    4.25  			if (parent)
    4.26  			{
    4.27  				parent->bringToFront( this );
    4.28 @@ -1723,7 +1730,12 @@
    4.29  	{
    4.30  		// there are more than one floater view
    4.31  		// so we need to query our parent directly
    4.32 -		((LLFloaterView*)getParent())->bringToFront(this, take_focus);
    4.33 +
    4.34 +		// <FS:ND/> Don't use C-cast to cast between objects.
    4.35 +		// ((LLFloaterView*)getParent())->bringToFront(this, take_focus);
    4.36 +		LLFloaterView* pView = dynamic_cast<LLFloaterView*>(getParent());
    4.37 +		if( pView )
    4.38 +			pView->bringToFront(this, take_focus);
    4.39  
    4.40  		// Make sure to set the appropriate transparency type (STORM-732).
    4.41  		updateTransparency(hasFocus() || getIsChrome() ? TT_ACTIVE : TT_INACTIVE);
    4.42 @@ -2941,14 +2953,9 @@
    4.43  		}
    4.44  	}
    4.45  
    4.46 -	// <FS:Ansariel> Memory corruption crash at login/logout
    4.47 -	//const LLRect& left_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_LEFT];
    4.48 -	//const LLRect& bottom_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_BOTTOM];
    4.49 -	//const LLRect& right_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_RIGHT];
    4.50 -	const LLRect& left_toolbar_rect = mToolbarLeftRect;
    4.51 -	const LLRect& bottom_toolbar_rect = mToolbarBottomRect;
    4.52 -	const LLRect& right_toolbar_rect = mToolbarRightRect;
    4.53 -	// </FS:Ansariel>
    4.54 +	const LLRect& left_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_LEFT];
    4.55 +	const LLRect& bottom_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_BOTTOM];
    4.56 +	const LLRect& right_toolbar_rect = mToolbarRects[LLToolBarEnums::TOOLBAR_RIGHT];
    4.57  	const LLRect& floater_rect = floater->getRect();
    4.58  
    4.59  	S32 delta_left = left_toolbar_rect.notEmpty() ? left_toolbar_rect.mRight - floater_rect.mRight : 0;
    4.60 @@ -3213,23 +3220,7 @@
    4.61  {
    4.62  	if (tb < LLToolBarEnums::TOOLBAR_COUNT)
    4.63  	{
    4.64 -		// <FS:Ansariel> Memory corruption crash at login/logout
    4.65 -		//mToolbarRects[tb] = toolbar_rect;
    4.66 -		switch (tb)
    4.67 -		{
    4.68 -			case LLToolBarEnums::TOOLBAR_LEFT:
    4.69 -				mToolbarLeftRect = toolbar_rect;
    4.70 -				break;
    4.71 -			case LLToolBarEnums::TOOLBAR_RIGHT:
    4.72 -				mToolbarRightRect = toolbar_rect;
    4.73 -				break;
    4.74 -			case LLToolBarEnums::TOOLBAR_BOTTOM:
    4.75 -				mToolbarBottomRect = toolbar_rect;
    4.76 -				break;
    4.77 -			default:
    4.78 -				break;
    4.79 -		}
    4.80 -		// </FS:Ansariel>
    4.81 +		mToolbarRects[tb] = toolbar_rect;
    4.82  	}
    4.83  }
    4.84  
     5.1 --- a/indra/llui/llfloater.h	Mon Feb 24 12:37:32 2014 -0800
     5.2 +++ b/indra/llui/llfloater.h	Mon Feb 24 13:57:12 2014 -0800
     5.3 @@ -595,12 +595,7 @@
     5.4  	void hiddenFloaterClosed(LLFloater* floater);
     5.5  
     5.6  	LLRect				mLastSnapRect;
     5.7 -	// <FS:Ansariel> Memory corruption crash at login/logout
     5.8 -	//LLRect				mToolbarRects[LLToolBarEnums::TOOLBAR_COUNT];
     5.9 -	LLRect			mToolbarLeftRect;
    5.10 -	LLRect			mToolbarRightRect;
    5.11 -	LLRect			mToolbarBottomRect;
    5.12 -	// </FS:Ansariel>
    5.13 +	LLRect				mToolbarRects[LLToolBarEnums::TOOLBAR_COUNT];
    5.14  	LLHandle<LLView>	mSnapView;
    5.15  	BOOL			mFocusCycleMode;
    5.16  	S32				mSnapOffsetBottom;
     6.1 --- a/indra/newview/CMakeLists.txt	Mon Feb 24 12:37:32 2014 -0800
     6.2 +++ b/indra/newview/CMakeLists.txt	Mon Feb 24 13:57:12 2014 -0800
     6.3 @@ -2464,7 +2464,7 @@
     6.4      set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest)
     6.5    endif (LINUX)
     6.6  
     6.7 -  if( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT ND_BUILD64BIT_ARCH )
     6.8 +  if( RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING )
     6.9    if(CMAKE_CFG_INTDIR STREQUAL ".")
    6.10        set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE})
    6.11    else(CMAKE_CFG_INTDIR STREQUAL ".")
    6.12 @@ -2488,7 +2488,7 @@
    6.13    add_custom_target(generate_breakpad_symbols DEPENDS "${VIEWER_SYMBOL_FILE}")
    6.14    add_dependencies(generate_breakpad_symbols "${VIEWER_BINARY_NAME}" "${VIEWER_COPY_MANIFEST}")
    6.15    add_dependencies(package generate_breakpad_symbols)
    6.16 -  endif( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND NOT ND_BUILD64BIT_ARCH )
    6.17 +  endif( RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING )
    6.18  endif (PACKAGE)
    6.19  
    6.20  if (LL_TESTS)
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/indra/newview/VivoxAUP.rtf	Mon Feb 24 13:57:12 2014 -0800
     7.3 @@ -0,0 +1,73 @@
     7.4 +{\rtf1\ansi\deff3\adeflang1025
     7.5 +{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Tinos;}{\f4\fswiss\fprq2\fcharset0 Arimo{\*\falt arial};}{\f5\fnil\fprq0\fcharset128 Tinos;}{\f6\fnil\fprq2\fcharset0 DejaVu Sans Condensed;}}
     7.6 +{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
     7.7 +{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\hich\af6\langfe1033\dbch\af6\afs24\lang1033\loch\f3\fs24\lang1033 Default;}
     7.8 +{\s15\sbasedon0\snext16\sb240\sa120\keepn\hich\af6\dbch\af6\afs28\loch\f4\fs28 Heading;}
     7.9 +{\s16\sbasedon0\snext16\sb0\sa120 Text body;}
    7.10 +{\s17\sbasedon16\snext17\sb0\sa120 List;}
    7.11 +{\s18\sbasedon0\snext18\sb120\sa120\noline\i\afs24\ai\fs24 Caption;}
    7.12 +{\s19\sbasedon0\snext19\noline Index;}
    7.13 +{\s20\sbasedon0\snext20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20 Preformatted Text;}
    7.14 +}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}{\comment OpenOffice}{\vern4010}}\deftab709
    7.15 +
    7.16 +{\*\pgdsctbl
    7.17 +{\pgdsc0\pgdscuse195\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default;}}
    7.18 +\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
    7.19 +\pgndec\pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.20 +Acceptable Use Policy (AUP)}
    7.21 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.22 +}
    7.23 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.24 +   }{\rtlch \ltrch\loch
    7.25 +1. BACKGROUND: Users of the online voice services provided by Vivox, Inc. ("Vivox") (the "Service"), through the act of utilizing the Service, agree to adhere to this Acceptable Use Policy (the "Policy"). Vivox reserves the right to immediately terminate a user's access to the Service if the user engages in any of the activities prohibited by this Policy or uses the Service contrary to this Policy. Each user is responsible for all activities conducted under its account. The user is also responsible for adhering to any policy set forth by any other service provider accessed through the Service; Vivox, and its suppliers and providers, assume no responsibility or liability for a user's failure to comply with the Policy. The user acknowledges that Vivox may have access to information about or provided by the user, including diagnostic information sent automatically after a problem or error, and agrees to such access and use.}
    7.26 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.27 +}
    7.28 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.29 +   }{\rtlch \ltrch\loch
    7.30 +2. PROHIBITED USES AND ACTIVITIES: Users shall not provide inaccurate or misleading information to Vivox or use the Service to: (i) access any other person's computer or computer system, software, or data without their knowledge and consent; or breach the security of another user; or attempt to circumvent the user authentication or security of any host, network, system, or account, which includes, but is not limited to, accessing data not intended for the user, logging into or making use of a server or account the user is not expressly authorized to access, or probing the security of other hosts, networks, or accounts; or use automated means (such as robots and spiders) to obtain information from Vivox's website or, though it, from other websites; (ii) interfere with computer networking or telecommunications service to any user, host or network, including, without limitation, denial of service attacks, flooding of a network, overloading a service, improper seizing and abuse of operator privileges and attempts to "crash" a host; (iii) violate the rules, regulations, or policies applicable to any network, server, computer database, or service that accessed by the user; (iv) transmit, re-transmit, or store any content or to engage in any activity that infringes the intellectual property rights or privacy rights of Vivox or any individual, group or entity, including but not limited to any rights protected by any copyright, patent, trademark, trade secret, trade dress, right of privacy, right of publicity, moral rights or other intellectual property right now known or later recognized by statute, judicial decision or regulation; (v) host, post, transmit, or re-transmit any content or material that is threatening, harassing, obscene, indecent, pornographic, hateful, malicious, racist, defamatory, libelous, treasonous, excessively violent or promotes the use of violence, or provides instruction, information or assistance in causing or carrying out violence against any government, organization, group or individual, or provides guidance, information or assistance with respect to causing damage or security breaches to or Vivox's network or to the network of any other service provider; (vi) commit an act that constitutes a criminal offense, gives rise to civil liability, or otherwise violates any applicable local, state, federal or international law, or (vii) encourage conduct that would constitute a criminal offense, give rise to civil liability, or otherwise violate any applicable local, state, federal or international law.}
    7.31 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.32 +}
    7.33 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.34 +   }{\rtlch \ltrch\loch
    7.35 +3. SECURITY: In all cases, the user is solely responsible for the security of any device or application it chooses to connect to the Service, including any data stored on or communications passed.}
    7.36 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.37 +}
    7.38 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.39 +   }{\rtlch \ltrch\loch
    7.40 +4. TRADEMARKS AND COPYRIGHTS. "Vivox," "Powered by Vivox" and similar marks are the property of Vivox. All other names, graphics, logos, marks and trade names used in connection with this Service, are the property of their owners and suppliers and may not be used without permission for any purpose. The copyright in the Vivox website and Service and all related materials are owned by Vivox or its suppliers unless otherwise stated.}
    7.41 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.42 +}
    7.43 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.44 +   }{\rtlch \ltrch\loch
    7.45 +5. DISCLAIMER OF WARRANTIES. THE SERVICE IS PROVIDED "AS IS" AND "WITH ALL FAULTS," AND PROVIDER AND VIVOX HEREBY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION (I) WARRANTIES OF MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, AND (II) ANY WARRANTIES CONCERNING THE SECURITY, RELIABILITY OR PERFORMANCE OF THE SERVICE. Certain states prohibit the disclaimer of warranties in certain cases, so the above may not apply to all users in all instances.}
    7.46 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.47 +}
    7.48 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.49 +      }{\rtlch \ltrch\loch
    7.50 +THE DOWNLOADING OR SUBMISSION OF ANY MATERIALS IS DONE AT THE USER'S OWN RISK, AND THE USER IS SOLELY RESPONSIBLE FOR ANY LOSS OR DAMAGE TO ANY CONTENT, IMAGE, COMPUTER SYSTEM OR DATA THAT MAY RESULT FROM USING THE SERVICE.}
    7.51 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.52 +}
    7.53 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.54 +   }{\rtlch \ltrch\loch
    7.55 +6. EXCLUSION OF DAMAGES. TO THE FULLEST EXTENT ALLOWED BY LAW, VIVOX SHALL NOT BE LIABLE FOR ANY INDIRECT OR CONSEQUENTIAL DAMAGES, INCLUDING INCIDENTAL, SPECIAL, EXEMPLARY AND PUNITIVE DAMAGES, RESULTING FROM THE USE OR PROVISION OF THE SERVICE, EVEN IF THE POSSIBILITY OF SUCH DAMAGES IS KNOWN. Certain states prohibit the limitation of liability in certain cases, so the above may not apply to the user in all instances.}
    7.56 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.57 +}
    7.58 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.59 +   }{\rtlch \ltrch\loch
    7.60 +7. ENFORCEMENT OF THIS POLICY: Vivox does not routinely monitors the activity of Service accounts for violation of this Policy. Vivox reserves the right at any time to monitor usage, transmissions, and content from time to time to operate the Service; to identify violations of this Policy; and/or to protect the network, the Service and/or other users. If the Service is used in a way that Vivox, in their sole discretion, believe violate this Policy, it may take any responsive actions they deem appropriate, including, but are not limited to, the immediate suspension or termination of all or any portion of the Service. Vivox will have no liability for any of these responsive actions. These actions are not exclusive remedies and Vivox may take any other legal or technical action deemed appropriate. The user expressly authorizes Vivox to cooperate with (i) law enforcement authorities in the investigation of suspected legal violations, and (ii) any system administrators at other Internet service providers or other network or computing facilities in order to enforce this Policy. This cooperation may include making available personally identifiable information about users to law enforcement or system administrators. The failure to enforce this Policy, for whatever reason or for no reason, shall not be construed as a waiver of any right to do so at any time. The user agrees that if any portion of this Policy is held invalid or unenforceable, such portion will be construed consistent with applicable law as nearly as possible, and the remaining portions will remain in full force and effect. The user agrees to indemnify, defend and hold harmless Vivox and its affiliates, suppliers, providers, and agents against all claims and expenses (including reasonable attorney fees) resulting from users engaging in any of the prohibited activities listed in this Policy or resulting from users violating the Policy or any other posted policy related to the Service. The foregoing user indemnification will survive any termination of the user's agreements with Vivox .}
    7.61 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.62 +}
    7.63 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.64 +   }{\rtlch \ltrch\loch
    7.65 +8. ARBITRATION. Except for the right of a party to seek equitable relief, any disputes arising under or related to this Agreement ("Dispute"), excluding any Dispute relating to the validity or infringement of any intellectual property right, will be resolved by negotiation, mediation and, if necessary, arbitration, as follows. The party raising such Dispute will promptly advise the other party in writing describing in reasonable detail the nature of such Dispute ("Notice of Dispute"). The parties will negotiate in good faith to resolve the Dispute, but if they have not done so within thirty (30) days, the parties will submit the Dispute to a mutually agreed mediation organization. If the parties are unable to resolve the Dispute within sixty (60) days after delivery of the Notice of Dispute, then the Dispute will be resolved by a single arbitrator in a final and binding arbitration under the then current procedural rules of the American Arbitration Association. All proceedings will be conducted in the English language in Boston, Massachusetts. The arbitrator will have no power to modify the terms or conditions of this Agreement, or to award punitive damages. Any award rendered in such arbitration may be enforced by either party in any Court of competent jurisdiction.}
    7.66 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.67 +}
    7.68 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.69 +   }{\rtlch \ltrch\loch
    7.70 +9. GENERAL TERMS. This Agreement is governed by the laws of the Commonwealth of Massachusetts. No agency, partnership, joint venture, employment or franchise relationship is intended or created by this Agreement. This AUP constitute the entire agreement between the parties concerning the use of the Service. If any provision of this Agreement is found to be unenforceable, it shall be deemed modified to the least extent needed to make the provision enforceable; the remaining terms of this Agreement shall remain in full force and effect. Vivox reserves the right to disclose any information about any user as required by a court order or as recommended by counsel in the context of any action by any government entity or other third party.}
    7.71 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch\loch
    7.72 +}
    7.73 +\par \pard\plain \s20\sb0\sa0\hich\af5\dbch\af5\afs20\loch\f5\fs20{\rtlch \ltrch
    7.74 +  }{\rtlch \ltrch\loch
    7.75 +10. CHANGES TO THIS POLICY. Vivox may revise its Acceptable Use Policy from time to time without prior notice. Any changes will be presented in the latest version at the Vivox web site. All revised copies of the Policy are effective immediately upon a user's first use of the Service after the change has been posted.}
    7.76 +\par }
    7.77 \ No newline at end of file
     8.1 --- a/indra/newview/fsfloaterim.cpp	Mon Feb 24 12:37:32 2014 -0800
     8.2 +++ b/indra/newview/fsfloaterim.cpp	Mon Feb 24 13:57:12 2014 -0800
     8.3 @@ -882,7 +882,7 @@
     8.4  	if (mMeTyping)
     8.5  	{
     8.6  		// Send an additional Start Typing packet every ME_TYPING_TIMEOUT seconds
     8.7 -		if (mMeTypingTimer.getElapsedTimeF32() > ME_TYPING_TIMEOUT && false == mShouldSendTypingState)
     8.8 +		if (mMeTypingTimer.getElapsedTimeF32() > ME_TYPING_TIMEOUT && false == mShouldSendTypingState && mDialog == IM_NOTHING_SPECIAL)
     8.9  		{
    8.10  			LL_DEBUGS("TypingMsgs") << "Send additional Start Typing packet" << LL_ENDL;
    8.11  			LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, TRUE);
     9.1 --- a/indra/newview/fsfloaterimcontainer.cpp	Mon Feb 24 12:37:32 2014 -0800
     9.2 +++ b/indra/newview/fsfloaterimcontainer.cpp	Mon Feb 24 13:57:12 2014 -0800
     9.3 @@ -293,9 +293,9 @@
     9.4  	LLFloater* floaterp = get_ptr_in_map(mSessions, session_id);
     9.5  	LLFloater* current_floater = LLMultiFloater::getActiveFloater();
     9.6  
     9.7 -    // KC: Don't flash tab on friend status changes per setting
     9.8 -    if (floaterp && current_floater && floaterp != current_floater
     9.9 -     && (gSavedSettings.getBOOL("FSIMChatFlashOnFriendStatusChange") || data["from_id"].asUUID() !=  LLUUID::null))
    9.10 +	// KC: Don't flash tab on friend status changes per setting
    9.11 +	if (floaterp && current_floater && floaterp != current_floater
    9.12 +		&& (gSavedSettings.getBOOL("FSIMChatFlashOnFriendStatusChange") || !data.has("from_id") || data["from_id"].asUUID().notNull()))
    9.13  	{
    9.14  		if(LLMultiFloater::isFloaterFlashing(floaterp))
    9.15  			LLMultiFloater::setFloaterFlashing(floaterp, FALSE);
    10.1 Binary file indra/newview/installers/windows/firestorm_icon_small.BMP has changed
    11.1 Binary file indra/newview/installers/windows_x64/ExtractCab.dll has changed
    12.1 --- a/indra/newview/installers/windows_x64/build.bat	Mon Feb 24 12:37:32 2014 -0800
    12.2 +++ b/indra/newview/installers/windows_x64/build.bat	Mon Feb 24 13:57:12 2014 -0800
    12.3 @@ -20,20 +20,26 @@
    12.4  
    12.5  set PATH=%PATH%;%1\..\..\packages\bin\wix
    12.6  
    12.7 -heat dir %VIEWER_BUILDDIR%\app_settings -gg -cg fs_appsettings -var var.BUILDDIR -dr INSTALLDIR -out app_settings.wxs
    12.8  heat dir %VIEWER_BUILDDIR%\character -gg -cg fs_character -var var.BUILDDIR -dr INSTALLDIR -out character.wxs
    12.9  heat dir %VIEWER_BUILDDIR%\fonts -gg -cg fs_fonts -var var.BUILDDIR -dr INSTALLDIR -out fonts.wxs
   12.10  heat dir %VIEWER_BUILDDIR%\fs_resources -gg -cg fs_fsres -var var.BUILDDIR -dr INSTALLDIR -out fs_resources.wxs
   12.11 -heat dir %VIEWER_BUILDDIR%\skins -gg -cg fs_skins -var var.BUILDDIR -dr INSTALLDIR -out skins.wxs
   12.12  
   12.13 -candle -dBUILDDIR=%VIEWER_BUILDDIR%\app_settings app_settings.wxs
   12.14 +python %~dp0\compress_assets.py %VIEWER_BUILDDIR%\skins %VIEWER_BUILDDIR%\skins
   12.15 +python %~dp0\compress_assets.py %VIEWER_BUILDDIR%\app_settings %VIEWER_BUILDDIR%\app_settings
   12.16 +
   12.17  candle -dBUILDDIR=%VIEWER_BUILDDIR%\character character.wxs
   12.18  candle -dBUILDDIR=%VIEWER_BUILDDIR%\fonts fonts.wxs
   12.19  candle -dBUILDDIR=%VIEWER_BUILDDIR%\fs_resources fs_resources.wxs
   12.20 -candle -dBUILDDIR=%VIEWER_BUILDDIR%\skins skins.wxs
   12.21  
   12.22  candle -dPLUGIN_SOURCEDIR=%PLUGIN_SOURCEDIR% %~dp0\llplugin.wxs
   12.23 -candle -dPROGRAM_FILE=%PROGRAM_FILE% -dMAJOR=%MAJOR% -dMINOR=%MINOR% -dHGCHANGE=%HGCHANGE% -dBUILDDIR=%VIEWER_BUILDDIR%\ %~dp0\firestorm.wxs
   12.24 +candle -dPROGRAM_FILE=%PROGRAM_FILE% -dMAJOR=%MAJOR% -dMINOR=%MINOR% -dHGCHANGE=%HGCHANGE% -dBUILDDIR=%VIEWER_BUILDDIR%\ -dWIX_SOURCEDIR=%~dp0 %~dp0\firestorm.wxs
   12.25  candle -dPROGRAM_FILE=%PROGRAM_FILE% -dPROGRAM_VERSION=%PROGRAM_VERSION% -dCHANNEL_NAME=%CHANNEL_NAME% -dSETTINGS_FILE=%SETTINGS_FILE% -dPROGRAM_NAME=%PROGRAM_NAME% -dBUILDDIR=%VIEWER_BUILDDIR%\ %~dp0\registry.wxs
   12.26  
   12.27 -light -sval -ext WixUIExtension -cultures:en-us -out %VIEWER_BUILDDIR%\%OUTPUT_FILE% firestorm.wixobj app_settings.wixobj character.wixobj fonts.wixobj fs_resources.wixobj llplugin.wixobj registry.wixobj skins.wixobj
   12.28 +light -sval -ext WixUIExtension -cultures:en-us -out %VIEWER_BUILDDIR%\%OUTPUT_FILE%.msi firestorm.wixobj character.wixobj fonts.wixobj fs_resources.wixobj llplugin.wixobj registry.wixobj
   12.29 +
   12.30 +signtool.exe sign /n Phoenix /d Firestorm /du http://www.phoenixviewer.com %VIEWER_BUILDDIR%\%OUTPUT_FILE%.msi
   12.31 +
   12.32 +candle -dMAJOR=%MAJOR% -dMINOR=%MINOR% -dHGCHANGE=%HGCHANGE% -dWIX_SOURCEDIR=%~dp0 -dFS_MSI_FILE=%VIEWER_BUILDDIR%\%OUTPUT_FILE%.msi -ext WixBalExtension %~dp0\installer.wxs
   12.33 +light -sval -ext WixBalExtension -out %VIEWER_BUILDDIR%\%OUTPUT_FILE%.exe installer.wixobj
   12.34 +
   12.35 +signtool.exe sign /n Phoenix /d Firestorm /du http://www.phoenixviewer.com %VIEWER_BUILDDIR%\%OUTPUT_FILE%.exe
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/indra/newview/installers/windows_x64/compress_assets.py	Mon Feb 24 13:57:12 2014 -0800
    13.3 @@ -0,0 +1,89 @@
    13.4 +from os import  walk
    13.5 +from os.path import join, dirname
    13.6 +import sys
    13.7 +
    13.8 +import md5
    13.9 +
   13.10 +from locale import getdefaultlocale
   13.11 +
   13.12 +def asUTF8( aString ):
   13.13 +    sLocale = "iso-8859-15"
   13.14 +    if getdefaultlocale()[1] != None:
   13.15 +	    sLocale = getdefaultlocale()[1]
   13.16 +
   13.17 +    return aString.decode( sLocale ).encode( "UTF-8" )
   13.18 +
   13.19 +from msilib import FCICreate
   13.20 +totalFiles = 0
   13.21 +
   13.22 +hHashes = {}
   13.23 +
   13.24 +cabNames = []
   13.25 +linkNames = []
   13.26 +
   13.27 +searchPath = sys.argv[1].replace( "/", "\\" )
   13.28 +
   13.29 +if searchPath[ len( searchPath ) -1 ] != "\\":
   13.30 +    searchPath += "\\" 
   13.31 +
   13.32 +for root, dirs, files in walk( sys.argv[1] ):
   13.33 +    totalFiles += len( files )
   13.34 +    for curFile in files:
   13.35 +        fullPath = join( root, curFile )
   13.36 +        strippedPath = fullPath[ len( searchPath ): ]
   13.37 +        data = open( fullPath, "rb" ).read()
   13.38 +        md5Hash = md5.new(data).hexdigest()
   13.39 +        writeFile = True
   13.40 +        if hHashes.has_key( md5Hash ):
   13.41 +            hHashes[ md5Hash ][0] += 1
   13.42 +            writeFile = False
   13.43 +        else:
   13.44 +            hHashes[ md5Hash ] = [1,len(data), strippedPath ]
   13.45 +
   13.46 +        if writeFile:
   13.47 +            cabNames.append( ( fullPath,
   13.48 +                               str( len( cabNames )+1 )
   13.49 +                           ) )
   13.50 +        else:
   13.51 +            linkNames.append( (hHashes[ md5Hash ][2], strippedPath) )
   13.52 +
   13.53 +FCICreate( sys.argv[2] + ".cab", cabNames )
   13.54 +fDir = open( sys.argv[2] + ".cabdir", "wt" )
   13.55 +
   13.56 +dirNames = []
   13.57 +for cabEntry in cabNames:
   13.58 +    dirPath = cabEntry[0]
   13.59 +    dirPath = dirname( dirPath )
   13.60 +    dirPath = dirPath[ len(searchPath): ]
   13.61 +    subDirs = dirPath.split( "\\" )
   13.62 +    if 0 == len( subDirs[ -1 ] ):
   13.63 +        subDirs = subDirs[ :-1]
   13.64 +
   13.65 +    curDir = ""
   13.66 +    for subDir in subDirs:
   13.67 +        curDir = join( curDir, subDir );
   13.68 +        dirNames.append( "d:" + curDir )
   13.69 +
   13.70 +for linkName in linkNames:
   13.71 +    subDirs = dirname( linkName[1] ).split( "\\" )
   13.72 +    if 0 == len( subDirs[ -1 ] ):
   13.73 +        subDirsTree = subDirsTree[ :-1]
   13.74 +
   13.75 +    curDir = ""
   13.76 +    for subDir in subDirs:
   13.77 +        curDir = join( curDir, subDir );
   13.78 +        dirNames.append( "d:" + curDir )
   13.79 +
   13.80 +
   13.81 +dirNames = list( set( dirNames ) )
   13.82 +dirNames.sort()
   13.83 +for dirName in dirNames:
   13.84 +    fDir.write( asUTF8( dirName ) + "\n" )
   13.85 +
   13.86 +for cabEntry in cabNames:
   13.87 +    dirPath = cabEntry[0]
   13.88 +    dirPath = dirPath[ len(searchPath): ]
   13.89 +    fDir.write( "f:" + asUTF8( cabEntry[1] ) + ":" + asUTF8( dirPath ) + "\n" )
   13.90 +
   13.91 +for linkName in linkNames:
   13.92 +    fDir.write( "l:" + asUTF8( linkName[0] ) + ":" + asUTF8( linkName[1] ) + "\n" )
    14.1 --- a/indra/newview/installers/windows_x64/firestorm.wxs	Mon Feb 24 12:37:32 2014 -0800
    14.2 +++ b/indra/newview/installers/windows_x64/firestorm.wxs	Mon Feb 24 13:57:12 2014 -0800
    14.3 @@ -7,7 +7,7 @@
    14.4  
    14.5    <Package InstallerVersion="200" Compressed="yes" Platform="x64"/>
    14.6    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." MigrateFeatures="no"/>
    14.7 -  <Icon Id="firestorm.ico" SourceFile="..\..\..\indra\newview\installers\windows\firestorm_icon.ico"/>
    14.8 +  <Icon Id="firestorm.ico" SourceFile="$(var.WIX_SOURCEDIR)\..\windows\firestorm_icon.ico"/>
    14.9    <Property Id="MSIFASTINSTALL" Value="1"/>
   14.10    <Property Id="ARPSIZE" Value="204800"/>
   14.11    <Property Id="ARPURLINFOABOUT" Value="http://www.firestormviewer.org"/>
   14.12 @@ -52,6 +52,10 @@
   14.13        <File Source="$(var.BUILDDIR)/gpu_table.txt" />
   14.14        <File Source="$(var.BUILDDIR)/licenses.txt" />
   14.15        <File Source="$(var.BUILDDIR)/VivoxAUP.txt" />
   14.16 +      <File Source="$(var.BUILDDIR)/skins.cab" />
   14.17 +      <File Source="$(var.BUILDDIR)/skins.cabdir" />
   14.18 +      <File Source="$(var.BUILDDIR)/app_settings.cab" />
   14.19 +      <File Source="$(var.BUILDDIR)/app_settings.cabdir" />
   14.20       </Component>
   14.21  
   14.22       <Component Id="slvoice" Guid="{6BF56CA8-0D48-4ea8-B3E8-CD38B7C502E6}">
   14.23 @@ -98,13 +102,42 @@
   14.24     <ComponentRef Id="llplugin_dir_codec_libs" />
   14.25     <ComponentRef Id="llplugin_dir_imageformat_libs" />
   14.26  
   14.27 -   <ComponentGroupRef Id="fs_appsettings" />
   14.28     <ComponentGroupRef Id="fs_character" />
   14.29     <ComponentGroupRef Id="fs_fonts" />
   14.30     <ComponentGroupRef Id="fs_fsres" />
   14.31 -   <ComponentGroupRef Id="fs_skins" />
   14.32    </Feature>
   14.33 +  <Binary Id="ExtractCab" SourceFile="$(var.WIX_SOURCEDIR)\ExtractCab.dll" />
   14.34 +
   14.35 +  <CustomAction Id="ExtractSkins_pre" Property="ExtractSkins"
   14.36 +				Value="InstallDir=[INSTALLDIR]\skins\;CabFile=[INSTALLDIR]\skins.cab;CabDirFile=[INSTALLDIR]\skins.cabdir"/>
   14.37 +  <CustomAction Id="ExtractSkins" BinaryKey="ExtractCab" DllEntry="ExtractCab" Execute="deferred" Return="check" Impersonate="no" HideTarget="no"/>
   14.38 +
   14.39 +  <CustomAction Id="DeleteSkins_pre" Property="DeleteSkins"
   14.40 +				Value="InstallDir=[INSTALLDIR]\skins\;CabFile=[INSTALLDIR]\skins.cab;CabDirFile=[INSTALLDIR]\skins.cabdir"/>
   14.41 +  <CustomAction Id="DeleteSkins" BinaryKey="ExtractCab" DllEntry="DeleteExtracted" Execute="deferred" Return="check" Impersonate="no" HideTarget="no"/>
   14.42          
   14.43 +  <CustomAction Id="ExtractAppSettings_pre" Property="ExtractAppSettings"
   14.44 +				Value="InstallDir=[INSTALLDIR]\app_settings\;CabFile=[INSTALLDIR]\app_settings.cab;CabDirFile=[INSTALLDIR]\app_settings.cabdir"/>
   14.45 +  <CustomAction Id="ExtractAppSettings" BinaryKey="ExtractCab" DllEntry="ExtractCab" Execute="deferred" Return="check" Impersonate="no" HideTarget="no"/>
   14.46 +
   14.47 +  <CustomAction Id="DeleteAppSettings_pre" Property="DeleteAppSettings"
   14.48 +				Value="InstallDir=[INSTALLDIR]\app_settings\;CabFile=[INSTALLDIR]\app_settings.cab;CabDirFile=[INSTALLDIR]\app_settings.cabdir"/>
   14.49 +  <CustomAction Id="DeleteAppSettings" BinaryKey="ExtractCab" DllEntry="DeleteExtracted" Execute="deferred" Return="check" Impersonate="no" HideTarget="no"/>
   14.50 +
   14.51 +
   14.52 +  <InstallExecuteSequence>
   14.53 +    <Custom Action="ExtractSkins_pre" After="InstallInitialize">Not Installed</Custom>
   14.54 +    <Custom Action="ExtractSkins" Before="InstallFinalize">Not Installed</Custom>
   14.55 +    <Custom Action="DeleteSkins_pre" After="InstallInitialize">REMOVE</Custom>
   14.56 +    <Custom Action="DeleteSkins" Before="RemoveFiles">REMOVE</Custom>
   14.57 +
   14.58 +    <Custom Action="ExtractAppSettings_pre" After="InstallInitialize">Not Installed</Custom>
   14.59 +    <Custom Action="ExtractAppSettings" Before="InstallFinalize">Not Installed</Custom>
   14.60 +    <Custom Action="DeleteAppSettings_pre" After="InstallInitialize">REMOVE</Custom>
   14.61 +    <Custom Action="DeleteAppSettings" Before="RemoveFiles">REMOVE</Custom>
   14.62 +  </InstallExecuteSequence>
   14.63 +
   14.64 +  <WixVariable Id="WixUILicenseRtf" Value="$(var.WIX_SOURCEDIR)/../../VivoxAUP.rtf" />
   14.65    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
   14.66    <UIRef Id="WixUI_InstallDir"/>
   14.67    </Product>
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/indra/newview/installers/windows_x64/installer.wxs	Mon Feb 24 13:57:12 2014 -0800
    15.3 @@ -0,0 +1,56 @@
    15.4 +<?xml version="1.0" encoding="utf-8"?> 
    15.5 +
    15.6 +<Wix RequiredVersion="3.6.2830.0" xmlns="http://schemas.microsoft.com/wix/2006/wi"  xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> 
    15.7 +  <Bundle Name="Firestorm x64"
    15.8 +		  Version="$(var.MAJOR).$(var.MINOR).$(var.HGCHANGE)"
    15.9 +		  Manufacturer="Phoenix Firestorm Project Inc"
   15.10 +		  UpgradeCode="{32BC3287-D4C6-43AC-A98A-54BF1AFA610D}"
   15.11 +		  HelpUrl="http://www.firestormviewer.org" 
   15.12 +		  AboutUrl="http://www.firestormviewer.org" 
   15.13 +		  Copyright="Copyright© 2014, Phoenix Firestorm Project Inc" 
   15.14 +		  Condition="VersionNT >= v6.0"
   15.15 +		  IconSourceFile="$(var.WIX_SOURCEDIR)\..\windows\firestorm_icon.ico"
   15.16 +		  >
   15.17 +
   15.18 +    <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
   15.19 +      <bal:WixStandardBootstrapperApplication
   15.20 +          LicenseFile="$(var.WIX_SOURCEDIR)\..\..\VivoxAUP.rtf"
   15.21 +          LogoFile="$(var.WIX_SOURCEDIR)\..\windows\firestorm_icon_small.BMP"
   15.22 +          />
   15.23 +	</BootstrapperApplicationRef>
   15.24 +
   15.25 +	<!--
   15.26 +    <WixVariable Id="WixStdbaLicenseUrl" Value="" /> 
   15.27 +    <WixVariable Id="WixStdbaLogo" Value="Resource\logoSmall.png" /> 
   15.28 +    <WixVariable Id="WixStdbaLicenseFile" Value="test.rtf" /> 
   15.29 +	-->
   15.30 +
   15.31 +    <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]Firestorm\" /> 
   15.32 +
   15.33 +    <Chain> 
   15.34 +	  <ExePackage
   15.35 +		  Id="vcredist_x86"
   15.36 +		  SourceFile="$(var.WIX_SOURCEDIR)/vcredist_x86.exe"
   15.37 +		  InstallCommand="/q"
   15.38 +		  PerMachine="yes"
   15.39 +		  Vital="no"
   15.40 +		  />
   15.41 +	  <ExePackage
   15.42 +		  Id="vcredist_x64"
   15.43 +		  SourceFile="$(var.WIX_SOURCEDIR)/vcredist_x64.exe"
   15.44 +		  InstallCommand="/q"
   15.45 +		  PerMachine="yes"
   15.46 +		  Vital="no"
   15.47 +		  />
   15.48 +      <MsiPackage 
   15.49 +          Id="Setup" 
   15.50 +          Compressed="yes" 
   15.51 +          SourceFile="$(var.FS_MSI_FILE)" 
   15.52 +          Vital="yes"
   15.53 +		  ForcePerMachine="yes"
   15.54 +		  >
   15.55 +        <MsiProperty Name="INSTALLLOCATION" Value="[InstallFolder]" /> 
   15.56 +      </MsiPackage> 
   15.57 +    </Chain> 
   15.58 +  </Bundle> 
   15.59 +</Wix>
    16.1 Binary file indra/newview/installers/windows_x64/vcredist_x64.exe has changed
    17.1 Binary file indra/newview/installers/windows_x64/vcredist_x86.exe has changed
    18.1 --- a/indra/newview/llpanelface.cpp	Mon Feb 24 12:37:32 2014 -0800
    18.2 +++ b/indra/newview/llpanelface.cpp	Mon Feb 24 13:57:12 2014 -0800
    18.3 @@ -122,8 +122,8 @@
    18.4  F32		LLPanelFace::getCurrentShinyRot()			{ return mCtrlShinyRot->getValue().asReal();						}
    18.5  F32		LLPanelFace::getCurrentShinyScaleU()		{ return mCtrlShinyScaleU->getValue().asReal();					}
    18.6  F32		LLPanelFace::getCurrentShinyScaleV()		{ return mCtrlShinyScaleV->getValue().asReal();					}
    18.7 -F32		LLPanelFace::getCurrentShinyOffsetU()		{ return mCtrlShinyScaleU->getValue().asReal();					}
    18.8 -F32		LLPanelFace::getCurrentShinyOffsetV()		{ return mCtrlShinyScaleV->getValue().asReal();					}
    18.9 +F32		LLPanelFace::getCurrentShinyOffsetU()		{ return mCtrlShinyOffsetU->getValue().asReal();					}
   18.10 +F32		LLPanelFace::getCurrentShinyOffsetV()		{ return mCtrlShinyOffsetV->getValue().asReal();					}
   18.11  
   18.12  // <FS:CR> UI provided diffuse parameters
   18.13  F32		LLPanelFace::getCurrentTextureRot()			{ return mCtrlTexRot->getValue().asReal();						}
    19.1 --- a/indra/newview/llviewermessage.cpp	Mon Feb 24 12:37:32 2014 -0800
    19.2 +++ b/indra/newview/llviewermessage.cpp	Mon Feb 24 13:57:12 2014 -0800
    19.3 @@ -5134,7 +5134,7 @@
    19.4  				
    19.5  				LLSD args;
    19.6  				args["MESSAGE"] = completed_from;
    19.7 -				LLNotificationsUtil::add("SystemMessageTip", args);
    19.8 +				LLNotificationsUtil::add("ChatSystemMessageTip", args);
    19.9  			}
   19.10  			// [/FS:CR]
   19.11  			// Set the new position
   19.12 @@ -7322,10 +7322,7 @@
   19.13  
   19.14  			// <FS:Ansariel> Only play when we want
   19.15  			//send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f);
   19.16 -			if (gSavedSettings.getBOOL("PlayModeUISndRestart"))
   19.17 -			{
   19.18 -				send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f);
   19.19 -			}
   19.20 +			make_ui_sound("UISndRestart");
   19.21  			// </FS:Ansariel>
   19.22  		}
   19.23  
   19.24 @@ -7532,10 +7529,7 @@
   19.25  				}
   19.26  			}
   19.27  
   19.28 -			if (gSavedSettings.getBOOL("PlayModeUISndRestartOpenSim"))
   19.29 -			{
   19.30 -				send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestartOpenSim")), 1.0f);
   19.31 -			}
   19.32 +			make_ui_sound("UISndRestartOpenSim");
   19.33  			return;
   19.34  		}
   19.35  		// </FS:Ansariel>
    20.1 --- a/indra/newview/llviewerwindow.cpp	Mon Feb 24 12:37:32 2014 -0800
    20.2 +++ b/indra/newview/llviewerwindow.cpp	Mon Feb 24 13:57:12 2014 -0800
    20.3 @@ -368,6 +368,9 @@
    20.4  		{
    20.5  			{
    20.6  			const U32 y_inc2 = 15;
    20.7 +				// <FS:Ansariel> FIRE-9746: Show FPS with DebugShowTime
    20.8 +				addText(xpos, ypos, llformat("FPS: %3.1f", LLViewerStats::getInstance()->mFPSStat.getMeanPerSec())); ypos += y_inc2;
    20.9 +				// </FS:Ansariel>
   20.10  				LLFrameTimer& timer = gTextureTimer;
   20.11  				F32 time = timer.getElapsedTimeF32();
   20.12  				S32 hours = (S32)(time / (60*60));
   20.13 @@ -1979,10 +1982,7 @@
   20.14  
   20.15  	// Constrain floaters to inside the menu and status bar regions.
   20.16  	gFloaterView = main_view->getChild<LLFloaterView>("Floater View");
   20.17 -	// <FS:Ansariel> Memory corruption crash at login/logout
   20.18 -	//for (S32 i = 0; i < LLToolBarEnums::TOOLBAR_COUNT; ++i)
   20.19 -	for (S32 i = LLToolBarEnums::TOOLBAR_FIRST; i <= LLToolBarEnums::TOOLBAR_LAST; ++i)
   20.20 -	// </FS:Ansariel>
   20.21 +	for (S32 i = 0; i < LLToolBarEnums::TOOLBAR_COUNT; ++i)
   20.22  	{
   20.23  		LLToolBar * toolbarp = gToolBarView->getToolbar((LLToolBarEnums::EToolBarLocation)i);
   20.24  		if (toolbarp)
    21.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Mon Feb 24 12:37:32 2014 -0800
    21.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Mon Feb 24 13:57:12 2014 -0800
    21.3 @@ -6105,6 +6105,14 @@
    21.4  
    21.5    <notification
    21.6     icon="notifytip.tga"
    21.7 +   name="ChatSystemMessageTip"
    21.8 +   type="notifytip"
    21.9 +   log_to_chat="true">
   21.10 +[MESSAGE]
   21.11 +  </notification>
   21.12 +
   21.13 +  <notification
   21.14 +   icon="notifytip.tga"
   21.15     name="Cancelled"
   21.16     type="notifytip">
   21.17  Cancelled.
    22.1 --- a/indra/newview/viewer_manifest.py	Mon Feb 24 12:37:32 2014 -0800
    22.2 +++ b/indra/newview/viewer_manifest.py	Mon Feb 24 13:57:12 2014 -0800
    22.3 @@ -764,7 +764,7 @@
    22.4            substitution_strings['installer_file'] = installer_file
    22.5            self.run_command('"' + createMSI + '" ' + self.dst_path_of( "" ) +
    22.6                             " " + self.channel() + " " + substitution_strings[ 'version' ] +
    22.7 -                           " " + settingsFile + " " + installer_file + " " + " ".join( substitution_strings[ 'version' ].split(".") ) )
    22.8 +                           " " + settingsFile + " " + installer_file[:-4] + " " + " ".join( substitution_strings[ 'version' ].split(".") ) )
    22.9            
   22.10  
   22.11          self.fs_sign_win_installer( substitution_strings ) # <FS:ND/> Sign files, step two. Sign installer.
   22.12 @@ -1213,45 +1213,39 @@
   22.13          
   22.14          if self.is_packaging_viewer():
   22.15            if self.prefix("../packages/lib/release", dst="lib"):
   22.16 -            self.path("libapr-1.so")
   22.17 -            self.path("libapr-1.so.0")
   22.18 -            self.path("libapr-1.so.0.4.5")
   22.19 -            self.path("libaprutil-1.so")
   22.20 -            self.path("libaprutil-1.so.0")
   22.21 -            self.path("libaprutil-1.so.0.4.1")
   22.22 -            self.path("libboost_context-mt.so.*")
   22.23 -            self.path("libboost_filesystem-mt.so.*")
   22.24 -            self.path("libboost_program_options-mt.so.*")
   22.25 -            self.path("libboost_regex-mt.so.*")
   22.26 -            self.path("libboost_signals-mt.so.*")
   22.27 -            self.path("libboost_system-mt.so.*")
   22.28 -            self.path("libboost_thread-mt.so.*")
   22.29 -            self.path("libboost_chrono-mt.so.*") #<FS:TM> FS spcific
   22.30 -            self.path("libboost_date_time-mt.so.*") #<FS:TM> FS spcific
   22.31 -            self.path("libboost_wave-mt.so.*") #<FS:TM> FS spcific
   22.32 -            self.path("libcollada14dom.so")
   22.33 -            self.path("libdb*.so")
   22.34 -            self.path("libcrypto.so.*")
   22.35 -            self.path("libexpat.so.*")
   22.36 -            self.path("libssl.so.1.0.0")
   22.37 +            self.path("libapr-1.so*")
   22.38 +            self.path("libaprutil-1.so*")
   22.39 +            self.path("libboost_context-mt.so*")
   22.40 +            self.path("libboost_filesystem-mt.so*")
   22.41 +            self.path("libboost_program_options-mt.so*")
   22.42 +            self.path("libboost_regex-mt.so*")
   22.43 +            self.path("libboost_signals-mt.so*")
   22.44 +            self.path("libboost_system-mt.so*")
   22.45 +            self.path("libboost_thread-mt.so*")
   22.46 +            self.path("libboost_chrono-mt.so*") #<FS:TM> FS spcific
   22.47 +            self.path("libboost_date_time-mt.so*") #<FS:TM> FS spcific
   22.48 +            self.path("libboost_wave-mt.so*") #<FS:TM> FS spcific
   22.49 +            self.path("libcollada14dom.so*")
   22.50 +            self.path("libdb*.so*")
   22.51 +            self.path("libcrypto.so*")
   22.52 +            self.path("libexpat.so*")
   22.53 +            self.path("libssl.so*")
   22.54              self.path("libGLOD.so")
   22.55              self.path("libminizip.so")
   22.56              self.path("libuuid.so*")
   22.57 -            self.path("libSDL-1.2.so.*")
   22.58 -            self.path("libdirectfb-1.*.so.*")
   22.59 -            self.path("libfusion-1.*.so.*")
   22.60 -            self.path("libdirect-1.*.so.*")
   22.61 +            self.path("libSDL-1.2.so*")
   22.62 +            self.path("libdirectfb*.so*")
   22.63 +            self.path("libfusion*.so*")
   22.64 +            self.path("libdirect*.so*")
   22.65              self.path("libopenjpeg.so*")
   22.66 -            self.path("libdirectfb-1.4.so.5")
   22.67 -            self.path("libfusion-1.4.so.5")
   22.68 -            self.path("libdirect-1.4.so.5*")
   22.69              self.path("libhunspell-1.3.so*")
   22.70 -            self.path("libalut.so")
   22.71 +            self.path("libalut.so*")
   22.72              self.path("libpng15.so.15") #use provided libpng to workaround incompatible system versions on some distros
   22.73              self.path("libpng15.so.15.13.0") #use provided libpng to workaround incompatible system versions on some distros
   22.74 -            self.path("libopenal.so", "libopenal.so.1")
   22.75 +            self.path("libopenal.so*")
   22.76              #self.path("libnotify.so.1.1.2", "libnotify.so.1") # LO - uncomment when testing libnotify(growl) on linux
   22.77              self.path("libpangox-1.0.so*")
   22.78 +
   22.79              # KLUDGE: As of 2012-04-11, the 'fontconfig' package installs
   22.80              # libfontconfig.so.1.4.4, along with symlinks libfontconfig.so.1
   22.81              # and libfontconfig.so. Before we added support for library-file
   22.82 @@ -1270,6 +1264,7 @@
   22.83              # previous call did, without having to explicitly state the
   22.84              # version number.
   22.85              self.path("libfontconfig.so.*.*")
   22.86 +
   22.87              try:
   22.88                  self.path("libtcmalloc.so*") #formerly called google perf tools
   22.89                  pass
   22.90 @@ -1374,21 +1369,19 @@
   22.91  
   22.92              self.end_prefix("lib")
   22.93  
   22.94 -            self.prefix(src="../packages/lib/release/x86", dst="lib")
   22.95 -
   22.96 -            try:
   22.97 -                self.path("libLeap.so")
   22.98 -            except:
   22.99 -                print "Leap Motion library not found"
  22.100 -
  22.101 -            self.end_prefix("lib")
  22.102 +          self.prefix(src="../packages/lib/release/x86", dst="lib")
  22.103 +          try:
  22.104 +              self.path("libLeap.so")
  22.105 +          except:
  22.106 +              print "Leap Motion library not found"
  22.107 +          self.end_prefix("lib")
  22.108  
  22.109  
  22.110  class Linux_x86_64_Manifest(LinuxManifest):
  22.111      def construct(self):
  22.112          super(Linux_x86_64_Manifest, self).construct()
  22.113  
  22.114 -        if self.is_packaging_viewer():        
  22.115 +        if self.is_packaging_viewer():
  22.116            if self.prefix("../packages/lib/release", dst="lib"):
  22.117  
  22.118              # vivox 32-bit hack.
  22.119 @@ -1406,6 +1399,13 @@
  22.120  
  22.121              self.end_prefix("lib")
  22.122  
  22.123 +          self.prefix(src="../packages/lib/release/x64", dst="lib")
  22.124 +          try:
  22.125 +              self.path("libLeap.so")
  22.126 +          except:
  22.127 +              print "Leap Motion library not found"
  22.128 +          self.end_prefix("lib")
  22.129 +
  22.130          # support file for valgrind debug tool
  22.131          self.path("secondlife-i686.supp")
  22.132  
    23.1 --- a/scripts/configure_firestorm.sh	Mon Feb 24 12:37:32 2014 -0800
    23.2 +++ b/scripts/configure_firestorm.sh	Mon Feb 24 13:57:12 2014 -0800
    23.3 @@ -405,6 +405,11 @@
    23.4          TARGET="Xcode"
    23.5      elif [ \( $PLATFORM == "linux32" \) -o \( $PLATFORM == "linux64" \) ] ; then
    23.6          TARGET="Unix Makefiles"
    23.7 +        if [ "${AUTOBUILD_ARCH}" == "x64" ]
    23.8 +        then
    23.9 +          TARGET_ARCH="x64"
   23.10 +          WORD_SIZE=64
   23.11 +        fi
   23.12      elif [ \( $PLATFORM == "win32" \) ] ; then
   23.13          if [ "${AUTOBUILD_ARCH}" == "x64" ]
   23.14          then
   23.15 @@ -417,7 +422,7 @@
   23.16          UNATTENDED="-DUNATTENDED=ON"
   23.17      fi
   23.18  
   23.19 -    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $LEAPMOTION $OPENSIM $AVX_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=32 -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
   23.20 +    cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $LEAPMOTION $OPENSIM $AVX_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
   23.21            -DNDTARGET_ARCH="${TARGET_ARCH}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG
   23.22  
   23.23      if [ $PLATFORM == "win32" ] ; then

mercurial