diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-04-19 18:02:56 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-04-19 18:02:56 -0700 |
commit | 41357bb01297ce0977da7a3e2e9308d3c903d3a8 (patch) | |
tree | cf677aea0a81ecddbb394e64c9bd07db517880af /indra/newview/llfloaterinventory.cpp | |
parent | c3fa45282f5bdb0cb7a3fcd680154e88cafde4bb (diff) | |
parent | 3a7490e492b35d5dc55f6124d2e1acbca3bd4d79 (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
-rw-r--r-- | indra/newview/llfloaterinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index 6842d3dc74..4bffd41d29 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -34,7 +34,7 @@ #include "llfloaterinventory.h" -#include "llagent.h" +#include "llagentcamera.h" //#include "llfirstuse.h" #include "llfloaterreg.h" #include "llinventorymodel.h" @@ -79,7 +79,7 @@ LLFloaterInventory* LLFloaterInventory::showAgentInventory() instance_num = (instance_num + 1) % S32_MAX; LLFloaterInventory* iv = NULL; - if (!gAgent.cameraMouselook()) + if (!gAgentCamera.cameraMouselook()) { iv = LLFloaterReg::showTypedInstance<LLFloaterInventory>("inventory", LLSD(instance_num)); } |