diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-01 12:41:13 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-01 12:41:13 -0500 |
| commit | fe9a705709cbd5391ba67bdf3e3b33d2eb95dd29 (patch) | |
| tree | 411b470dcdbc0a218160f847df6722e3ebac6d60 /indra | |
| parent | 1f1afc253d31e0afc3a0de2718e31d03cfca7f43 (diff) | |
EXT-2922 : 2nd inventroy shouldn't list "New Window" as an option, since it silently fails
Fixed the behavior so that New Window brings up a new floater inventory window instead of doing nothing.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterinventory.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_inventory.xml | 2 |
2 files changed, 6 insertions, 2 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; } diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index dca1692e4a..ff9f0daee6 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -11,7 +11,7 @@ help_topic="inventory" save_rect="true" save_visibility="true" - single_instance="true" + single_instance="false" title="INVENTORY" width="467"> <floater.string |