diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-09 09:47:19 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-09 09:47:19 -0500 |
| commit | 3ed8f8907665d8700199a1181a5dd106a6804edb (patch) | |
| tree | 3c41a427dfbae7e14272ccd64d2f6bf47bf70216 /indra/newview/llpanelmaininventory.cpp | |
| parent | 837e38d8195b2928648c9c383bea1b3f1cf68fa5 (diff) | |
| parent | 41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 9944b51902..68ef13cd68 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -28,6 +28,7 @@ #include "llpanelmaininventory.h" #include "llagent.h" +#include "llagentcamera.h" #include "llavataractions.h" #include "lldndbutton.h" #include "lleconomy.h" @@ -294,7 +295,13 @@ void LLPanelMainInventory::closeAllFolders() void LLPanelMainInventory::newWindow() { - LLFloaterInventory::showAgentInventory(); + static S32 instance_num = 0; + instance_num = (instance_num + 1) % S32_MAX; + + if (!gAgentCamera.cameraMouselook()) + { + LLFloaterReg::showTypedInstance<LLFloaterSidePanelContainer>("inventory", LLSD(instance_num)); + } } void LLPanelMainInventory::doCreate(const LLSD& userdata) |