Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enter PERM_EXPORT, stage right.

Browse Source
This commit is contained in:
Lirusaito
2013-02-14 22:48:31 -05:00
committed by Melanie
parent 15fea2ef54
commit 45f3a171be
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llinventory/llpermissions.cpp
View File

@@ -1022,6 +1022,15 @@ void mask_to_string(U32 mask, char* str)
{
*str = ' ';
}
if (mask & PERM_EXPORT)
{
*str = 'E';
}
else
{
*str = ' ';
}
str++;
*str = '\0';
}

3
indra/llinventory/llpermissionsflags.h
View File

@@ -52,6 +52,9 @@ const PermissionBit PERM_MODIFY = (1 << 14); // 0x00004000
// objects, allow copy
const PermissionBit PERM_COPY = (1 << 15); // 0x00008000
// objects, allow exporting
const PermissionBit PERM_EXPORT = (1 << 16); // 0x00010000
// parcels, allow entry, deprecated
//const PermissionBit PERM_ENTER = (1 << 16); // 0x00010000

6
indra/newview/llfloaterproperties.cpp
View File

@@ -440,7 +440,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("CheckOwnerTransfer",FALSE);
childSetValue("CheckOwnerTransfer",LLSD((BOOL)(owner_mask & PERM_TRANSFER)));
childSetEnabled("CheckOwnerExport",false);
// childSetValue("CheckOwnerExport", (bool)(owner_mask & PERM_EXPORT));
childSetValue("CheckOwnerExport", (bool)(owner_mask & PERM_EXPORT));
///////////////////////
// DEBUG PERMISSIONS //
@@ -537,7 +537,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetValue("CheckEveryoneCopy",LLSD((BOOL)(everyone_mask & PERM_COPY)));
childSetValue("CheckEveryoneMove",LLSD((BOOL)(everyone_mask & PERM_MOVE)));
//childSetValue("CheckExport", everyone_mask & PERM_EXPORT);
childSetValue("CheckExport", everyone_mask & PERM_EXPORT);
///////////////
// SALE INFO //
@@ -760,7 +760,7 @@ void LLFloaterProperties::onCommitPermissions(LLUICtrl* ctrl, void* data)
LLCheckBoxCtrl* CheckExport = self->getChild<LLCheckBoxCtrl>("CheckExport");
if(CheckExport)
{
// perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(), CheckExport->get(), PERM_EXPORT);
perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(), CheckExport->get(), PERM_EXPORT);
}
LLCheckBoxCtrl* CheckNextOwnerModify = self->getChild<LLCheckBoxCtrl>("CheckNextOwnerModify");

10
indra/newview/llpanelpermissions.cpp
View File

@@ -625,8 +625,8 @@ void LLPanelPermissions::refresh()
LLStringUtil::replaceChar(perm_string, 'C', 'c');
if (diff_mask & PERM_TRANSFER)
LLStringUtil::replaceChar(perm_string, 'T', 't');
/* if (diff_mask & PERM_EXPORT)
LLStringUtil::replaceChar(perm_string, 'E', 'e');*/
if (diff_mask & PERM_EXPORT)
LLStringUtil::replaceChar(perm_string, 'E', 'e');
}
childSetText("B:",perm_string);
childSetVisible("B:",true);
@@ -791,7 +791,7 @@ void LLPanelPermissions::refresh()
}
// Export
/* if(everyone_mask_on & PERM_EXPORT)
if(everyone_mask_on & PERM_EXPORT)
{
childSetValue("checkbox allow export", true);
childSetTentative("checkbox allow export", false);
@@ -801,7 +801,7 @@ void LLPanelPermissions::refresh()
childSetValue("checkbox allow export", false);
childSetTentative("checkbox allow export", false);
}
else*/
else
{
childSetValue("checkbox allow export", true);
childSetTentative("checkbox allow export", true);
@@ -1093,7 +1093,7 @@ void LLPanelPermissions::onCommitEveryoneCopy(LLUICtrl *ctrl, void *data)
void LLPanelPermissions::onCommitExport()
{
// perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(), childGetValue("checkbox allow export"), PERM_EXPORT);
perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(), childGetValue("checkbox allow export"), PERM_EXPORT);
}
// static