summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-02-27 11:19:17 -0800
committerRichard Linden <none@none>2013-02-27 11:19:17 -0800
commit83eda3f1524a08fa6fc4fbd836c92ae95e8100bc (patch)
treeb7317c3ba90269fa0136e46f260223bd04210678 /indra/newview/llappearancemgr.h
parentdf3f6f6cacd3803748af569ad76ae1131ad1b1b9 (diff)
parent756ab4cad5908f30c29a9e86f6905745dbec616c (diff)
Automated merge with https://bitbucket.org/lindenlab/sunshine-internal
Diffstat (limited to 'indra/newview/llappearancemgr.h')
-rwxr-xr-xindra/newview/llappearancemgr.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 1a1ca1ca7d..b35504eb1f 100755
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -141,7 +141,7 @@ public:
// Find COF entries referencing the given item.
LLInventoryModel::item_array_t findCOFItemLinks(const LLUUID& item_id);
-
+
// Remove COF entries
void removeCOFItemLinks(const LLUUID& item_id);
void removeCOFLinksOfType(LLWearableType::EType type);
@@ -197,6 +197,11 @@ public:
void requestServerAppearanceUpdate(LLCurl::ResponderPtr responder_ptr = NULL);
+ void incrementCofVersion(LLHTTPClient::ResponderPtr responder_ptr = NULL);
+
+ // *HACK Remove this after server side texture baking is deployed on all sims.
+ void incrementCofVersionLegacy();
+
protected:
LLAppearanceMgr();
~LLAppearanceMgr();