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

Change MOTP to MoaP (Media on a Prim) internally, Shared Media to the user. Add German and Polish labels.

Tonya Souther 2012-11-01 07:21:11 -05:00
parent ca793ad0b8
commit 43b902d1a8
5 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/fsareasearch.cpp
View File

@ -98,7 +98,7 @@ FSAreaSearch::FSAreaSearch(const LLSD& key) :
mFilterLocked(false),
mFilterPhantom(false),
mFilterAttachment(false),
mFilterMOTP(false),
mFilterMoaP(false),
mFilterDistance(false),
mFilterDistanceMin(0),
mFilterDistanceMax(999999),
@ -654,20 +654,20 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje
return;
}
if (mFilterMOTP)
if (mFilterMoaP)
{
bool motp = false;
bool moap = false;
U8 texture_count = objectp->getNumTEs();
for(U8 i = 0; i < texture_count; i++)
{
if(objectp->getTE(i)->hasMedia())
{
motp = true;
moap = true;
break;
}
}
if(!motp)
if(!moap)
{
return;
}
@ -1557,8 +1557,8 @@ BOOL FSPanelAreaSearchFilter::postBuild()
mSpinDistanceMaxValue= getChild<LLSpinCtrl>("max_distance");
mSpinDistanceMaxValue->setCommitCallback(boost::bind(&FSPanelAreaSearchFilter::onCommitSpin, this));
mCheckboxMOTP = getChild<LLCheckBoxCtrl>("filter_motp");
mCheckboxMOTP->setCommitCallback(boost::bind(&FSPanelAreaSearchFilter::onCommitCheckbox, this));
mCheckboxMoaP = getChild<LLCheckBoxCtrl>("filter_moap");
mCheckboxMoaP->setCommitCallback(boost::bind(&FSPanelAreaSearchFilter::onCommitCheckbox, this));
return LLPanel::postBuild();
}
@ -1573,7 +1573,7 @@ void FSPanelAreaSearchFilter::onCommitCheckbox()
mFSAreaSearch->setFilterPhantom(mCheckboxPhantom->get());
mFSAreaSearch->setFilterForSale(mCheckboxForSale->get());
mFSAreaSearch->setFilterDistance(mCheckboxDistance->get());
mFSAreaSearch->setFilterMOTP(mCheckboxMOTP->get());
mFSAreaSearch->setFilterMoaP(mCheckboxMoaP->get());
if (mCheckboxExcludePhysics->get())
{

6
indra/newview/fsareasearch.h
View File

@ -123,7 +123,7 @@ public:
void setFilterTemporary(bool b) { mFilterTemporary = b; }
void setFilterPhantom(bool b) { mFilterPhantom = b; }
void setFilterAttachment(bool b) { mFilterAttachment = b; }
void setFilterMOTP(bool b) { mFilterMOTP = b; }
void setFilterMoaP(bool b) { mFilterMoaP = b; }
void setRegexSearch(bool b) { mRegexSearch = b; }
void setBeacons(bool b) { mBeacons = b; }
@ -206,7 +206,7 @@ private:
bool mFilterTemporary;
bool mFilterPhantom;
bool mFilterAttachment;
bool mFilterMOTP;
bool mFilterMoaP;
bool mFilterForSale;
S32 mFilterForSaleMin;
@ -332,7 +332,7 @@ private:
LLCheckBoxCtrl* mCheckboxTemporary;
LLCheckBoxCtrl* mCheckboxLocked;
LLCheckBoxCtrl* mCheckboxPhantom;
LLCheckBoxCtrl* mCheckboxMOTP;
LLCheckBoxCtrl* mCheckboxMoaP;
LLCheckBoxCtrl* mCheckboxDistance;
LLSpinCtrl* mSpinDistanceMinValue;
LLSpinCtrl* mSpinDistanceMaxValue;

3
indra/newview/skins/default/xui/de/floater_fs_area_search.xml
View File

@ -47,10 +47,11 @@
Nur Objekte mit folgenden Eigenschaften:
</text>
<check_box name="filter_locked" label="Gesperrt"/>
<check_box name="filter_physical" label="Physikalisch" width="90"/>
<check_box name="filter_physical" label="Physikalisch">
<check_box name="filter_phantom" label="Phantom"/>
<check_box name="filter_temporary" label="Temporär"/>
<check_box name="filter_attachment" label="Anhang"/>
<check_box name="filter_moap" label="Shared Media"/>
<check_box name="filter_for_sale" label="Zum Verkauf zwischen" width="150"/>
<text name="and">
und

19
indra/newview/skins/default/xui/en/floater_fs_area_search.xml
View File

@ -300,42 +300,43 @@
left="10"
name="filter_locked"
label="Locked"
width="80"/>
width="100"/>
<check_box
follows="top|left"
layout="topleft"
left_pad="0"
name="filter_physical"
label="Physical"
width="80"/>
width="100"/>
<check_box
follows="top|left"
layout="topleft"
name="filter_phantom"
label="Phantom"
left_pad="0"
width="80"/>
width="100"/>
<check_box
follows="top|left"
top_pad="10"
layout="topleft"
name="filter_temporary"
label="Temporary"
left_pad="0"
width="80"/>
left="10"
width="100"/>
<check_box
follows="top|left"
layout="topleft"
name="filter_attachment"
label="Attachment"
left_pad="0"
width="80"/>
width="100"/>
<check_box
follows="top|left"
layout="topleft"
name="filter_motp"
label="MOTP"
name="filter_moap"
label="Shared Media"
left_pad="0"
width="80"/>
width="100"/>
<check_box
follows="top|left"
height="20"

5
indra/newview/skins/default/xui/pl/floater_fs_area_search.xml
View File

@ -46,11 +46,12 @@
<text name="only_list">
Pokaż na liście tylko obiekty, które są:
</text>
<check_box name="filter_locked" label="Zablokowane" width="100"/>
<check_box name="filter_locked" label="Zablokowane">
<check_box name="filter_physical" label="Fizyczne"/>
<check_box name="filter_phantom" label="Widmowe"/>
<check_box name="filter_temporary" label="Tymczasowe" width="100"/>
<check_box name="filter_temporary" label="Tymczasowe"/>
<check_box name="filter_attachment" label="Dodatkami"/>
<check_box name="filter_moap" label="Z Shared Media"/>
<check_box name="filter_for_sale" label="Do kupienia między" width="135"/>
<text name="and" width="30">
oraz