diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
| commit | a2e23aa3d9f6e8c156e97244a7694256f41f93c3 (patch) | |
| tree | 1d7f37f638b7a17312164384b5b51216a34d6346 /indra/newview/llfloaterinventory.cpp | |
| parent | eae60da6839906059d904c12cc155f4c2738c893 (diff) | |
| parent | aa84c4afff251d771c7571803ccce56d1f439ae2 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
| -rw-r--r-- | indra/newview/llfloaterinventory.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index db38fc0fb3..4a2e1913cd 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -107,10 +107,14 @@ LLInventoryPanel* LLFloaterInventory::getPanel() // static LLFloaterInventory* LLFloaterInventory::showAgentInventory() { + // Hack to generate semi-unique key for each inventory floater. + static S32 instance_num = 0; + instance_num = (instance_num + 1) % S32_MAX; + LLFloaterInventory* iv = NULL; if (!gAgent.cameraMouselook()) { - iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD()); + iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD(instance_num)); } return iv; } |