diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
| commit | 8756727a525f3c4f72d790adafb8d719dfc24a94 (patch) | |
| tree | ee201c54b5e218ed449bb90c398355c0c88ffa4e /indra/llappearance | |
| parent | 8f07f8e233ed5ed6c5a7b6f797d0ee7b18b652e2 (diff) | |
| parent | 4bda6873ee7baac1ac34f92178d871c430da88c6 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/lllocaltextureobject.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llappearance/lllocaltextureobject.h b/indra/llappearance/lllocaltextureobject.h index 5505ef205a..a1b1178dee 100644 --- a/indra/llappearance/lllocaltextureobject.h +++ b/indra/llappearance/lllocaltextureobject.h @@ -27,8 +27,6 @@ #ifndef LL_LOCALTEXTUREOBJECT_H #define LL_LOCALTEXTUREOBJECT_H -#include <boost/shared_ptr.hpp> - #include "llpointer.h" #include "llgltexture.h" |