diff options
| author | Vaalith <none@none> | 2012-04-10 09:28:47 -0400 |
|---|---|---|
| committer | Vaalith <none@none> | 2012-04-10 09:28:47 -0400 |
| commit | 8d4c6771fdbea274eabc7a2e2606b3b77952cb4a (patch) | |
| tree | 304efa629bbddcee190f83c49f098733a3714201 /indra/newview/lllocalbitmaps.h | |
| parent | 4ff8067aa8f5117fa83e1a971b5bbc0c8fc033b2 (diff) | |
storm-64: One more toast on failure to verify initial image, and changed a bool to enum
Diffstat (limited to 'indra/newview/lllocalbitmaps.h')
| -rw-r--r-- | indra/newview/lllocalbitmaps.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index c6d05c1763..7a23c7ef6e 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/indra/newview/lllocalbitmaps.h @@ -39,7 +39,6 @@ class LLLocalBitmap public: /* main */ LLLocalBitmap(std::string filename); ~LLLocalBitmap(); - bool updateSelf(bool first_update = false); public: /* accessors */ std::string getFilename(); @@ -48,18 +47,25 @@ class LLLocalBitmap LLUUID getWorldID(); bool getValid(); - private: /* maintenance */ + public: /* self update public section */ + enum EUpdateType + { + UT_FIRSTUSE, + UT_REGUPDATE + }; + + bool updateSelf(EUpdateType = UT_REGUPDATE); + + private: /* self update private section */ bool decodeBitmap(LLPointer<LLImageRaw> raw); void replaceIDs(LLUUID old_id, LLUUID new_id); - - private: /* id replacement */ std::vector<LLViewerObject*> prepUpdateObjects(LLUUID old_id); void updateUserPrims(LLUUID old_id, LLUUID new_id); void updateUserSculpts(LLUUID old_id, LLUUID new_id); void updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableType::EType type); LLVOAvatarDefines::ETextureIndex getTexIndex(LLWearableType::EType type, LLVOAvatarDefines::EBakedTextureIndex baked_texind); - private: /* enums */ + private: /* private enums */ enum ELinkStatus { LS_ON, |