diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
commit | 5690becdf4743286b196a331c48c8aa0332a8c66 (patch) | |
tree | 7c64dba5dca5ccfc9631f92fa7d662257654137b /indra/newview/llsidepanelinventory.cpp | |
parent | 807fa3ee06cc139fcc41f69ed2caac20a8e8370d (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rwxr-xr-x | indra/newview/llsidepanelinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index b78cb61cb9..040cbc22a6 100755 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -59,7 +59,7 @@ #include "llviewernetwork.h" #include "llweb.h" -static LLRegisterPanelClassWrapper<LLSidepanelInventory> t_inventory("sidepanel_inventory"); +static LLPanelInjector<LLSidepanelInventory> t_inventory("sidepanel_inventory"); // // Constants |