diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index bca5960eb17d90e53a167c382b7e90c4a54d7c62..e58b11af7b42f8bc5c1e2d1a964462fcc63dce3e 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -84,10 +84,8 @@ class LLTextureEntry final LLTextureEntry(); LLTextureEntry(const LLUUID& tex_id); LLTextureEntry(const LLTextureEntry &rhs); - LLTextureEntry(LLTextureEntry&& rhs) noexcept; LLTextureEntry& operator=(const LLTextureEntry &rhs); - LLTextureEntry& operator=(LLTextureEntry&& rhs) noexcept; ~LLTextureEntry(); bool operator==(const LLTextureEntry &rhs) const; diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c45be78039d2798bb98311e8f287f5ab30952eec..32f900105439a49465b50dea4b226e4936cd0fac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -17569,7 +17569,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>4000</integer> + <integer>7000</integer> </map> <key>DisablePrecacheDelayAfterTeleporting</key> <map>