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

Merged with RLVa tip

Kitty Barnett 2012-11-26 23:12:48 +01:00
parent f168b2db27 67f2cf92e5
commit f7bfa94f8d
6 changed files with 134 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -363,3 +363,4 @@ b2f21e3442542283a80e7eaebae9f833e5a927b6 DRTVWR-237
b6b68f3c2c6dd04ad88bd0575aad67bf87a9c108 3.4.1-beta12
b6b68f3c2c6dd04ad88bd0575aad67bf87a9c108 3.4.1-beta12
3f9be82de642d468c5fc272cb9d96b46b5498402 3.4.1-beta12
674db463770b78f836fc9c87a1b2235e212a576c RLVa-1.4.7

4
indra/newview/lltoolselect.cpp
View File

@ -84,7 +84,7 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
}
// [RLVa:KB] - Checked: 2010-11-29 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
if (rlv_handler_t::isEnabled())
if ( (object) && (rlv_handler_t::isEnabled()) )
{
if (!gRlvHandler.canEdit(object))
{
@ -94,7 +94,7 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
LLToolMgr::instance().toggleBuildMode();
}
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (object) && ((!object->isAttachment()) || (!object->permYouOwner())) &&
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && ((!object->isAttachment()) || (!object->permYouOwner())) &&
(dist_vec_squared(gAgent.getPositionAgent(), object->getPositionRegion()) > 1.5f * 1.5f) )
{
// NOTE: see behaviour notes for a rather lengthy explanation of why we're doing things this way

2
indra/newview/rlvhelper.cpp
View File

@ -1091,7 +1091,7 @@ void RlvBehaviourNotifyHandler::sendNotification(const std::string& strText, con
for (std::multimap<LLUUID, notifyData>::const_iterator itNotify = pThis->m_Notifications.begin();
itNotify != pThis->m_Notifications.end(); ++itNotify)
{
if ( (itNotify->second.strFilter.empty()) || (std::string::npos != strText.find(itNotify->second.strFilter)) )
if ( (itNotify->second.strFilter.empty()) || (boost::icontains(strText, itNotify->second.strFilter)) )
RlvUtil::sendChatReply(itNotify->second.nChannel, "/" + strText + strSuffix);
}
}

135
indra/newview/skins/default/xui/en/floater_rlv_behaviours.xml
View File

@ -1,121 +1,98 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
open_positioning="cascading"
can_close="true"
can_drag_on_left="false"
can_minimize="true"
can_resize="true"
height="300"
min_height="200"
min_width="333"
min_height="300"
min_width="300"
name="rlv_behaviours"
save_rect="true"
save_visibility="true"
save_visibility="false"
single_instance="true"
title="Active RLV Restrictions"
width="333">
title="ACTIVE RLV RESTRICTIONS"
width="300">
<tab_container
follows="all"
height="267"
layout="topleft"
left="7"
left="8"
name="behaviour_tab"
tab_height="25"
tab_min_width="154"
height="266"
right="-8"
tab_height="23"
tab_min_width="120"
tab_position="top"
top="2"
width="318">
<panel
follows="all"
height="242"
label="Restrictions"
layout="topleft"
name="behaviour_panel"
width="318">
top="0" >
<panel
follows="all" height="265"
label="RESTRICTIONS"
layout="topleft"
name="behaviour_panel"
top="0">
<scroll_list
draw_border="false"
draw_heading="true"
draw_stripes="true"
follows="all"
height="242"
layout="topleft"
multi_select="false"
name="behaviour_list"
top="0">
<scroll_list.columns
label="Restriction"
name="behaviour"
width="100" />
<scroll_list.columns
label="Object Name"
name="issuer"
width="210" />
draw_border="false"
draw_heading="true"
draw_stripes="true"
follows="all"
height="266"
layout="topleft"
multi_select="false"
name="behaviour_list"
tool_tip="List of current RLVa restrictions."
top_pad="0" >
<scroll_list.columns label="Restriction" name="behaviour" width="70" />
<scroll_list.columns label="Object Name" name="issuer" />
</scroll_list>
</panel>
<panel
follows="all"
height="242"
label="Exceptions"
layout="topleft"
name="exception_panel"
width="318">
<panel
follows="all" height="265"
label="EXCEPTIONS"
layout="topleft"
name="exception_panel"
top="0">
<scroll_list
draw_border="false"
draw_heading="true"
draw_stripes="true"
follows="all"
height="242"
layout="topleft"
multi_select="false"
name="exception_list"
top_pad="0">
<scroll_list.columns
label="Restriction"
name="behaviour"
width="100" />
<scroll_list.columns
label="Option"
name="option"
width="105" />
<scroll_list.columns
label="Object Name"
name="issuer"
width="105" />
draw_border="false"
draw_heading="true"
draw_stripes="true"
follows="all"
height="266"
layout="topleft"
multi_select="false"
name="exception_list"
tool_tip="List of current RLVa exceptions."
top_pad="0" >
<scroll_list.columns label="Exception" name="behaviour" width="70" />
<scroll_list.columns label="Source" name="option" width="105" />
<scroll_list.columns label="Object Name" name="issuer" />
</scroll_list>
</panel>
</tab_container>
<panel
background_visible="false"
follows="left|right|bottom"
height="27"
height="25"
label="bottom_panel"
layout="topleft"
left="7"
name="bottom_panel"
top_pad="0"
width="313">
top_pad="0">
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Left_Over"
image_overlay="Copy"
image_overlay_alignment="left"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
label="Copy to Clipboard"
layout="topleft"
left="3"
left="0"
name="copy_btn"
top="1"
tool_tip="Copy restrictions to clipboard"
width="131" />
width="129" />
<icon
follows="bottom|left|right"
height="25"
follows="left|right"
image_name="Toolbar_Right_Off"
layout="topleft"
left_pad="1"
name="dummy_icon"
width="182"/>
top="1"
width="153" />
</panel>
</floater>

83
indra/newview/skins/default/xui/en/floater_rlv_locks.xml
View File

@ -1,64 +1,25 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_close="true"
can_minimize="true"
can_resize="true"
height="400"
min_height="300"
min_width="500"
name="rlvLocks"
save_rect="true"
save_visibility="true"
single_instance="true"
title="Active RLV Locks"
width="500">
<scroll_list
background_visible="false"
draw_border="false"
draw_heading="true"
draw_stripes="true"
follows="all"
height="373"
layout="topleft"
multi_select="false"
name="lock_list"
top="0"
width="500">
<scroll_list.columns label="Lock Type" name="lock_type" width="110" />
<scroll_list.columns label="Add / Rem" name="lock_addrem" width="75" />
<scroll_list.columns label="Lock Target" name="lock_target" width="150" />
<scroll_list.columns label="Held By" name="lock_origin" width="150" />
</scroll_list>
can_close="true"
can_minimize="true"
can_resize="true"
height="200"
min_height="200"
min_width="500"
name="rlvLocks"
save_rect="true"
save_visibility="false"
single_instance="true"
positioning="cascading"
reuse_instance="true"
title="ACTIVE RLV LOCKS"
width="500">
<panel
background_visible="false"
follows="left|right|bottom"
height="27"
layout="topleft"
left="0"
name="bottom_panel"
top_pad="0"
width="500">
<button
follows="bottom|left"
height="25"
image_hover_unselected="Toolbar_Left_Over"
image_overlay="Refresh_Off"
image_overlay_alignment="left"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
label="Refresh"
layout="topleft"
left="0"
name="refresh_btn"
top="1"
width="74" />
<icon
follows="bottom|left|right"
height="25"
image_name="Toolbar_Right_Off"
layout="topleft"
left_pad="1"
name="dummy_icon"
width="425"/>
</panel>
</floater>
class="panel_rlvLocks"
filename="panel_rlv_locks.xml"
layout="topleft"
left="9"
name="panel_rlvLocks"
right="-8"
top="0" />
</floater>

52
indra/newview/skins/default/xui/en/panel_rlv_locks.xml Normal file
View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
height="200"
label="ACTIVE RLV LOCKS"
layout="topleft"
name="panel_rlvLocks"
top="0"
width="500">
<scroll_list
draw_border="false"
draw_heading="true"
draw_stripes="true"
follows="all"
height="167"
layout="topleft"
multi_select="false"
name="lock_list"
top_pad="0" >
<scroll_list.columns label="Lock Type" name="lock_type" width="100" />
<scroll_list.columns label="Method" name="lock_addrem" width="60" />
<scroll_list.columns label="Target Object / Point" name="lock_target" />
<scroll_list.columns label="Lock Origin" name="lock_origin" width="150" />
</scroll_list>
<panel
background_visible="false"
follows="left|right|bottom"
height="25"
label="bottom_panel"
layout="topleft"
name="bottom_panel"
top_pad="0" >
<button
image_hover_unselected="Toolbar_Left_Over"
image_overlay="Refresh_Off"
image_overlay_alignment="left"
image_selected="Toolbar_Left_Selected"
image_unselected="Toolbar_Left_Off"
label="Refresh"
left="0"
name="refresh_btn"
top="1"
width="74" />
<icon
follows="left|right"
image_name="Toolbar_Right_Off"
left_pad="1"
name="dummy_icon"
top="1"
width="425" />
</panel>
</panel>