Skip to content
Snippets Groups Projects
Commit fe9a7057 authored by Loren Shih's avatar Loren Shih
Browse files

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
parent 1f1afc25
No related branches found
No related tags found
No related merge requests found
...@@ -107,10 +107,14 @@ LLInventoryPanel* LLFloaterInventory::getPanel() ...@@ -107,10 +107,14 @@ LLInventoryPanel* LLFloaterInventory::getPanel()
// static // static
LLFloaterInventory* LLFloaterInventory::showAgentInventory() 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; LLFloaterInventory* iv = NULL;
if (!gAgent.cameraMouselook()) if (!gAgent.cameraMouselook())
{ {
iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD()); iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD(instance_num));
} }
return iv; return iv;
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
help_topic="inventory" help_topic="inventory"
save_rect="true" save_rect="true"
save_visibility="true" save_visibility="true"
single_instance="true" single_instance="false"
title="INVENTORY" title="INVENTORY"
width="467"> width="467">
<floater.string <floater.string
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment