diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-12-13 08:05:03 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-12-13 08:05:03 +0200 |
| commit | 553a98723b3d1ee7ac2cab00b6373dbe4e40dd89 (patch) | |
| tree | 91057784e4e2db2c9dc00d2c001e8ee12e46c6f1 /indra/newview/lltextureview.cpp | |
| parent | de0317cc3f5f42ccf51a7bbfdd04e8b16d51e811 (diff) | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
Merge branch 'main' into DRTVWR-539
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rw-r--r-- | indra/newview/lltextureview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index b74577315e..cf9211767e 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -234,7 +234,6 @@ void LLTextureBar::draw() { "DSK", LLColor4::cyan }, // LOAD_FROM_TEXTURE_CACHE { "DSK", LLColor4::blue }, // CACHE_POST { "NET", LLColor4::green }, // LOAD_FROM_NETWORK - { "SIM", LLColor4::green }, // LOAD_FROM_SIMULATOR { "HTW", LLColor4::green }, // WAIT_HTTP_RESOURCE { "HTW", LLColor4::green }, // WAIT_HTTP_RESOURCE2 { "REQ", LLColor4::yellow },// SEND_HTTP_REQ |