summaryrefslogtreecommitdiff
path: root/indra/newview/lloutfitobserver.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-06-15 14:57:16 +0100
committerAimee Linden <aimee@lindenlab.com>2010-06-15 14:57:16 +0100
commit0b523e402720493cd19a2fa08f8cffceea01eadf (patch)
treedc5137535761f87729932ed1de2ec33273b43b32 /indra/newview/lloutfitobserver.cpp
parentd5ddb91a6809540cdb407cd48eff32b2c595d5db (diff)
parentfce2653f6b5e8ca3509d13e3449b1fdd2f5ff826 (diff)
Merge
Diffstat (limited to 'indra/newview/lloutfitobserver.cpp')
-rw-r--r--indra/newview/lloutfitobserver.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/lloutfitobserver.cpp b/indra/newview/lloutfitobserver.cpp
index efa01bade9..03414b9964 100644
--- a/indra/newview/lloutfitobserver.cpp
+++ b/indra/newview/lloutfitobserver.cpp
@@ -56,12 +56,9 @@ void LLOutfitObserver::changed(U32 mask)
if (!gInventory.isInventoryUsable())
return;
- bool COF_changed = checkCOF();
+ checkCOF();
- if (!COF_changed)
- {
- checkBaseOutfit();
- }
+ checkBaseOutfit();
}
// static