Fix build

Tue, 13 Mar 2018 20:27:57 +0100

author
Ansariel
date
Tue, 13 Mar 2018 20:27:57 +0100
changeset 55338
255b9dfb5d68
parent 55337
47a0198ea43a
child 55339
42bc0e961099

Fix build

indra/newview/llfloaterreporter.cpp file | annotate | diff | revisions
indra/newview/llinventorymodel.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llfloaterreporter.cpp	Tue Mar 13 19:52:37 2018 +0100
     1.2 +++ b/indra/newview/llfloaterreporter.cpp	Tue Mar 13 20:27:57 2018 +0100
     1.3 @@ -259,6 +259,7 @@
     1.4  			//floater_reporter->takeNewSnapshot();
     1.5  			floater_reporter->takeNewSnapshot(false);
     1.6  			// </FS:Ansariel>
     1.7 +		}
     1.8  	}
     1.9  }
    1.10  
     2.1 --- a/indra/newview/llinventorymodel.cpp	Tue Mar 13 19:52:37 2018 +0100
     2.2 +++ b/indra/newview/llinventorymodel.cpp	Tue Mar 13 20:27:57 2018 +0100
     2.3 @@ -364,6 +364,9 @@
     2.4  
     2.5  bool LLInventoryModel::isCategoryHidden(const LLUUID& id) const
     2.6  {
     2.7 +	// <FS:Ansariel> Show inbox folder depending on FSShowInboxFolder setting
     2.8 +	static LLCachedControl<bool> fsShowInboxFolder(gSavedSettings, "FSShowInboxFolder");
     2.9 +
    2.10  	bool res = false;
    2.11  	const LLViewerInventoryCategory* category = getCategory(id);
    2.12  	if (category)
    2.13 @@ -373,8 +376,7 @@
    2.14  		{
    2.15  			case LLFolderType::FT_INBOX:
    2.16  				// <FS:Ansariel> Show inbox folder depending on FSShowInboxFolder setting
    2.17 -				static LLCachedControl<bool> fsShowInboxFolder(gSavedSettings, "FSShowInboxFolder");
    2.18 -				res = !fsShowIndoxFolder;
    2.19 +				res = !fsShowInboxFolder;
    2.20  				break;
    2.21  				// </FS:Ansariel>
    2.22  			case LLFolderType::FT_OUTBOX:

mercurial