summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-03-19 16:29:32 -0400
committerJonathan Yap <none@none>2011-03-19 16:29:32 -0400
commitfbd241da54ad6017825b59c5b0c71086d8b8957a (patch)
tree34051dba97afece2416f25954080011d922d910e /indra/newview/llappearancemgr.cpp
parent834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff)
parent1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff)
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index f40fed5ad3..1cf552e42c 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2979,6 +2979,9 @@ public:
gAgent.setGenderChosen(TRUE);
}
+ // release avatar picker keyboard focus
+ gFocusMgr.setKeyboardFocus( NULL );
+
return true;
}
};