diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-08-14 17:13:46 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-08-14 17:13:46 -0400 |
| commit | 48b7eff75835058f144bbc27a5b2ef2997be2be4 (patch) | |
| tree | 53cc38357834b0f1b12e9689b77c99c85ed70a64 /indra/newview/llappearancemgr.cpp | |
| parent | 5ee461ab19ac86ef9712ad33435b821f9afe340c (diff) | |
| parent | e7a63cb356d49925131edfadb5a0e8d5368a9096 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/sunshine
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 0c7f89203e..3e02f98933 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1744,7 +1744,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering) updateIsDirty(); // Send server request for appearance update - if (useServerTextureBaking()) + if (gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion()) { requestServerAppearanceUpdate(); } @@ -2600,14 +2600,6 @@ void LLAppearanceMgr::updateClothingOrderingInfo(LLUUID cat_id, bool update_base if (inventory_changed) gInventory.notifyObservers(); } -// Should be true iff both the appropriate debug setting is enabled -// and the corresponding cap has been found. -bool LLAppearanceMgr::useServerTextureBaking() -{ - // TODO: add cap check. - return gSavedSettings.getBOOL("UseServerTextureBaking"); -} - class RequestAgentUpdateAppearanceResponder: public LLHTTPClient::Responder { public: |