diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
| commit | a98b4b6bee1b062722ce5eb03948a0fd33b74265 (patch) | |
| tree | 88c030cef0c480f19ab9ff0a187b5c866da3a24a /indra/newview/llpreviewscript.h | |
| parent | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
merge changes for 3.7.7-release
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rwxr-xr-x | indra/newview/llpreviewscript.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index 3ac48ae9c4..99b2f811f9 100755 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -27,7 +27,6 @@ #ifndef LL_LLPREVIEWSCRIPT_H #define LL_LLPREVIEWSCRIPT_H -#include "lldarray.h" #include "llpreview.h" #include "lltabcontainer.h" #include "llinventory.h" @@ -148,7 +147,7 @@ private: BOOL mForceClose; LLPanel* mCodePanel; LLScrollListCtrl* mErrorList; - LLDynamicArray<LLEntryAndEdCore*> mBridges; + std::vector<LLEntryAndEdCore*> mBridges; LLHandle<LLFloater> mLiveHelpHandle; LLKeywordToken* mLastHelpToken; LLFrameTimer mLiveHelpTimer; |