livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hg merge

meow-7.2.2
Leyla Farazha 2011-10-19 13:58:19 -07:00
parent 11bad6f75c e2b0e8fb1c
commit 3e61b37258
8 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/llfloater.cpp
View File

@ -539,7 +539,6 @@ LLFloater::~LLFloater()
delete mResizeHandle[i];
}
storeRectControl();
setVisible(false); // We're not visible if we're destroyed
storeVisibilityControl();
storeDockStateControl();

20
indra/llui/lltabcontainer.cpp
View File

@ -548,23 +548,23 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
}
S32 tab_count = getTabCount();
if (tab_count > 0)
if (tab_count > 0 && !getTabsHidden())
{
LLTabTuple* firsttuple = getTab(0);
LLRect tab_rect;
if (mIsVertical)
{
tab_rect = LLRect(firsttuple->mButton->getRect().mLeft,
has_scroll_arrows ? mPrevArrowBtn->getRect().mBottom - tabcntrv_pad : mPrevArrowBtn->getRect().mTop,
firsttuple->mButton->getRect().mRight,
has_scroll_arrows ? mNextArrowBtn->getRect().mTop + tabcntrv_pad : mNextArrowBtn->getRect().mBottom );
has_scroll_arrows ? mPrevArrowBtn->getRect().mBottom - tabcntrv_pad : mPrevArrowBtn->getRect().mTop,
firsttuple->mButton->getRect().mRight,
has_scroll_arrows ? mNextArrowBtn->getRect().mTop + tabcntrv_pad : mNextArrowBtn->getRect().mBottom );
}
else
{
tab_rect = LLRect(has_scroll_arrows ? mPrevArrowBtn->getRect().mRight : mJumpPrevArrowBtn->getRect().mLeft,
firsttuple->mButton->getRect().mTop,
has_scroll_arrows ? mNextArrowBtn->getRect().mLeft : mJumpNextArrowBtn->getRect().mRight,
firsttuple->mButton->getRect().mBottom );
firsttuple->mButton->getRect().mTop,
has_scroll_arrows ? mNextArrowBtn->getRect().mLeft : mJumpNextArrowBtn->getRect().mRight,
firsttuple->mButton->getRect().mBottom );
}
if( tab_rect.pointInRect( x, y ) )
{
@ -681,7 +681,7 @@ BOOL LLTabContainer::handleToolTip( S32 x, S32 y, MASK mask)
{
static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
BOOL handled = LLPanel::handleToolTip( x, y, mask);
if (!handled && getTabCount() > 0)
if (!handled && getTabCount() > 0 && !getTabsHidden())
{
LLTabTuple* firsttuple = getTab(0);
@ -812,7 +812,9 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDrag
{
BOOL has_scroll_arrows = (getMaxScrollPos() > 0);
if( mDragAndDropDelayTimer.getStarted() && mDragAndDropDelayTimer.getElapsedTimeF32() > SCROLL_DELAY_TIME )
if( !getTabsHidden()
&& mDragAndDropDelayTimer.getStarted()
&& mDragAndDropDelayTimer.getElapsedTimeF32() > SCROLL_DELAY_TIME )
{
if (has_scroll_arrows)
{

6
indra/llui/llview.cpp
View File

@ -721,7 +721,7 @@ LLView* LLView::childrenHandleCharEvent(const std::string& desc, const METHOD& m
// XDATA might be MASK, or S32 clicks
template <typename METHOD, typename XDATA>
LLView* LLView::childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra)
LLView* LLView::childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra, bool allow_mouse_block)
{
BOOST_FOREACH(LLView* viewp, mChildList)
{
@ -734,7 +734,7 @@ LLView* LLView::childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDA
}
if ((viewp->*method)( local_x, local_y, extra )
|| viewp->blockMouseEvent( local_x, local_y ))
|| (allow_mouse_block && viewp->blockMouseEvent( local_x, local_y )))
{
viewp->logMouseEvent();
return viewp;
@ -1021,7 +1021,7 @@ BOOL LLView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
{
return childrenHandleMouseEvent(&LLView::handleScrollWheel, x, y, clicks);
return childrenHandleMouseEvent(&LLView::handleScrollWheel, x, y, clicks, false);
}
// Called during downward traversal

2
indra/llui/llview.h
View File

@ -565,7 +565,7 @@ protected:
private:
template <typename METHOD, typename XDATA>
LLView* childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra);
LLView* childrenHandleMouseEvent(const METHOD& method, S32 x, S32 y, XDATA extra, bool allow_mouse_block = true);
template <typename METHOD, typename CHARTYPE>
LLView* childrenHandleCharEvent(const std::string& desc, const METHOD& method,

4
indra/newview/skins/default/xui/en/floater_camera.xml
View File

@ -167,14 +167,10 @@
<joystick_rotate
follows="top|left"
height="78"
image_selected="Cam_Rotate_In"
image_unselected="Cam_Rotate_Out"
layout="topleft"
left="7"
mouse_opaque="false"
name="cam_rotate_stick"
quadrant="left"
scale_image="false"
sound_flags="3"
visible="true"
tool_tip="Orbit camera around focus"

20
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5423,21 +5423,23 @@ Your calling card was declined.
</notification>
<notification
icon="notifytip.tga"
name="TeleportToLandmark"
type="notifytip">
You can teleport to locations like &apos;[NAME]&apos; by opening the Places panel on the right side of your screen, and then select the Landmarks tab.
Click on any landmark to select it, then click &apos;Teleport&apos; at the bottom of the panel.
(You can also double-click on the landmark, or right-click it and choose &apos;Teleport&apos;.)
icon="notifytip.tga"
name="TeleportToLandmark"
type="notifytip">
To teleport to locations like &apos;[NAME]&apos;, click on the &quot;Places&quot; button,
then select the Landmarks tab in the window that opens. Click on any
landmark to select it, then click &apos;Teleport&apos; at the bottom of the window.
(You can also double-click on the landmark, or right-click it and
choose &apos;Teleport&apos;.)
</notification>
<notification
icon="notifytip.tga"
name="TeleportToPerson"
type="notifytip">
You can contact Residents like &apos;[NAME]&apos; by opening the People panel on the right side of your screen.
Select the Resident from the list, then click &apos;IM&apos; at the bottom of the panel.
(You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
To contact Residents like &apos;[NAME]&apos;, click on the &quot;People&quot; button , select a Resident from the window that opens, then click &apos;IM&apos; at the
bottom of the window.
(You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
</notification>
<notification

12
indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
View File

@ -42,7 +42,7 @@
top="7"
width="189">
<button
auto_resize="true"
auto_resize="false"
follows="right"
height="29"
image_hover_selected="SegmentedBtn_Left_Over"
@ -57,9 +57,9 @@
tab_stop="false"
top="-28"
visible="false"
width="7" />
width="12" />
<button
auto_resize="true"
auto_resize="false"
follows="right"
height="29"
image_hover_selected="SegmentedBtn_Right_Over"
@ -74,7 +74,7 @@
tab_stop="false"
top="-28"
visible="false"
width="7" />
width="12" />
</chiclet_panel>
</layout_panel>
<layout_panel auto_resize="false"
@ -110,7 +110,7 @@ image_pressed "Lit" - there are new messages
image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open
-->
<button
auto_resize="true"
auto_resize="false"
follows="right"
halign="center"
height="23"
@ -151,7 +151,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
top="5"
width="35">
<button
auto_resize="true"
auto_resize="false"
bottom_pad="3"
follows="right"
halign="center"

7
indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<joystick_rotate
image_selected="Cam_Rotate_In"
image_unselected="Cam_Rotate_Out"
scale_image="false"
mouse_opaque="false"
held_down_delay.seconds="0"/>