summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-25 13:31:16 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-25 13:31:16 +0200
commit7fc90e2385c6376599818a3a7a3d815535671178 (patch)
tree3ccdf821a6785997ad654e05e3ea57075a2c0207
parent5f334e18b837493f9c6f7a62eb61f0aeec94d28b (diff)
fix for major EXT-4621 Clicking the Nearby Voice floater steals keyboard focus
note - didn't do this in xml since chrome="true" in xml hides floater caption --HG-- branch : product-engine
-rw-r--r--indra/newview/llcallfloater.cpp6
-rw-r--r--indra/newview/llnearbychat.cpp5
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index f346a4b8c2..d9767bc573 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -43,6 +43,7 @@
#include "llavatariconctrl.h"
#include "llavatarlist.h"
#include "llbottomtray.h"
+#include "lldraghandle.h"
#include "llimfloater.h"
#include "llfloaterreg.h"
#include "llparticipantlist.h"
@@ -174,6 +175,11 @@ BOOL LLCallFloater::postBuild()
connectToChannel(LLVoiceChannel::getCurrentVoiceChannel());
+ setIsChrome(true);
+ //chrome="true" hides floater caption
+ if (mDragHandle)
+ mDragHandle->setTitleVisible(TRUE);
+
return TRUE;
}
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index a7c1e73328..0a8d020b4f 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -101,6 +101,11 @@ BOOL LLNearbyChat::postBuild()
getDockTongue(), LLDockControl::TOP, boost::bind(&LLNearbyChat::getAllowedRect, this, _1)));
}
+ setIsChrome(true);
+ //chrome="true" hides floater caption
+ if (mDragHandle)
+ mDragHandle->setTitleVisible(TRUE);
+
return true;
}