diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
| commit | 21bfcbde7ec6e6b3e8a92237b7c33879216c4e82 (patch) | |
| tree | 5346bb05d7f74d2f2021883ff0ee4f32bbb56f4a /indra/llui/lltextbox.cpp | |
| parent | 2da8eb43d57ae6876f9955386f604f2c56849211 (diff) | |
| parent | aff85ed92c5aad3a9445cf4ec5447cc56c44dfc0 (diff) | |
Merge changes
Diffstat (limited to 'indra/llui/lltextbox.cpp')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 3dd8d21f6b..f9bcb685b8 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -32,12 +32,18 @@ #include "linden_common.h" #include "lltextbox.h" +#include "lllink.h" #include "lluictrlfactory.h" #include "llfocusmgr.h" #include "llwindow.h" static LLDefaultChildRegistry::Register<LLTextBox> r("text"); +//*NOTE +// LLLink is not used in code for now, therefor Visual Studio doesn't build it. +// "link" is registered here to force Visual Studio to build LLLink class. +static LLDefaultChildRegistry::Register<LLLink> register_link("link"); + LLTextBox::Params::Params() : text_color("text_color"), length("length"), |