diff options
| -rw-r--r--[-rwxr-xr-x] | indra/llmessage/llcurl.h | 0 | ||||
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/featuretable.txt | 0 | ||||
| -rw-r--r-- | indra/newview/llpanelmarketplaceinboxinventory.cpp | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llviewerobject.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llvovolume.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/xui/en/floater_model_preview.xml | 0 |
7 files changed, 4 insertions, 7 deletions
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index 87de202717..87de202717 100755..100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index fd4482f592..69dcd474f7 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -302,7 +302,7 @@ namespace LLInitParam } private: - friend BaseBlock; + friend class BaseBlock; U32 mEnclosingBlockOffset:31; U32 mIsProvided:1; @@ -1604,7 +1604,7 @@ namespace LLInitParam }; - class Flag : public FlagBase + class Flag : public BaseBlockWithFlags::FlagBase { public: Flag(const char* name) : FlagBase(name, DERIVED_BLOCK::selfBlockDescriptor().mCurrentBlockPtr) diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index e12c2f7853..e12c2f7853 100755..100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp index faba6dc0cf..2e4bf55d51 100644 --- a/indra/newview/llpanelmarketplaceinboxinventory.cpp +++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp @@ -196,15 +196,12 @@ void LLInboxFolderViewFolder::computeFreshness() if (last_expansion_utc > 0) { - const U32 time_offset_for_pdt = 7 * 60 * 60; - const U32 last_expansion = last_expansion_utc - time_offset_for_pdt; - - mFresh = (mCreationDate > last_expansion); + mFresh = (mCreationDate > last_expansion_utc); #if DEBUGGING_FRESHNESS if (mFresh) { - llinfos << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion << llendl; + llinfos << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion_utc << llendl; } #endif } diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d81e67bfe2..d81e67bfe2 100755..100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 380d63c77b..380d63c77b 100755..100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 2eea286c8b..2eea286c8b 100755..100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml |