Merged with tip

Sun, 18 Mar 2012 21:22:59 +0100

author
Kitty Barnett <develop@catznip.com>
date
Sun, 18 Mar 2012 21:22:59 +0100
changeset 1688
7edc20bfb582
parent 1687
54d0e6f6e432
parent 1686
e1500a5d2c63
child 1689
e3a13ca3d9c9

Merged with tip

     1.1 --- a/indra/newview/llimpanel.cpp	Sun Mar 18 21:22:34 2012 +0100
     1.2 +++ b/indra/newview/llimpanel.cpp	Sun Mar 18 21:22:59 2012 +0100
     1.3 @@ -1520,13 +1520,7 @@
     1.4  		childSetVisible("prefixViewerToggle",TRUE);
     1.5  		childSetVisible("prefixViewerExtraText",TRUE);
     1.6  		prefixViewer->setValue(gSavedSettings.getBOOL("PhoenixSupportGroupchatPrefix2"));
     1.7 -        
     1.8 -		// Don't popup the dialog if the user allready set prefix to true -- TW
     1.9 -		if (gSavedSettings.getBOOL("PhoenixSupportGroupchatPrefix2"))
    1.10 -		{
    1.11 -			return;
    1.12 -		}
    1.13 -		
    1.14 +
    1.15  		// <FS:Zi> Viewer version popup
    1.16  		// check if the dialog was set to ignore
    1.17  		LLNotificationTemplatePtr templatep=LLNotifications::instance().getTemplate("FirstJoinSupportGroup");

mercurial