| 1916 |
LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH); |
LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH); |
| 1917 |
LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND); |
LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND); |
| 1918 |
//MK |
//MK |
| 1919 |
// Not only this is needed for RestrainedLife, but this also fixes |
// Not only this is needed for RestrainedLove, but this also fixes |
| 1920 |
// a regular viewer bug. |
// a regular viewer bug. |
| 1921 |
// We need to clear the context menu, or some menu items would not refresh |
// We need to clear the context menu, or some menu items would not refresh |
| 1922 |
// when objects are locked/unlocked (RestrainedLife), or worn/unworn or |
// when objects are locked/unlocked (RestrainedLove), or worn/unworn or |
| 1923 |
// attached/detached (regular viewers) and the context menu is pulled down |
// attached/detached (regular viewers) and the context menu is pulled down |
| 1924 |
// in-between. |
// in-between. |
| 1925 |
mItems.clear(); |
mItems.clear(); |
| 2985 |
BOOL take_focus) |
BOOL take_focus) |
| 2986 |
{ |
{ |
| 2987 |
//MK |
//MK |
| 2988 |
if (gRRenabled && gAgent.mRRInterface.contains ("viewnote")) { |
if (gRRenabled && gAgent.mRRInterface.contains ("viewnote")) |
| 2989 |
|
{ |
| 2990 |
return; |
return; |
| 2991 |
} |
} |
| 2992 |
//mk |
//mk |
| 3329 |
// but the name itself could also have the information => check |
// but the name itself could also have the information => check |
| 3330 |
attachmentp = gAgent.mRRInterface.findAttachmentPointFromName (item->getName()); |
attachmentp = gAgent.mRRInterface.findAttachmentPointFromName (item->getName()); |
| 3331 |
if (attachmentp) rez_attachment(item, attachmentp); |
if (attachmentp) rez_attachment(item, attachmentp); |
| 3332 |
else if (!gAgent.mRRInterface.mContainsDefaultwear && gSavedSettings.getBOOL("RestrainedLifeAllowWear")) rez_attachment(item, NULL); |
else if (!gAgent.mRRInterface.mContainsDefaultwear && gSavedSettings.getBOOL("RestrainedLoveAllowWear")) rez_attachment(item, NULL); |
| 3333 |
} |
} |
| 3334 |
} |
} |
| 3335 |
else |
else |
| 3337 |
// this is a mod item, wear it according to its name |
// this is a mod item, wear it according to its name |
| 3338 |
attachmentp = gAgent.mRRInterface.findAttachmentPointFromName (item->getName()); |
attachmentp = gAgent.mRRInterface.findAttachmentPointFromName (item->getName()); |
| 3339 |
if (attachmentp) rez_attachment(item, attachmentp); |
if (attachmentp) rez_attachment(item, attachmentp); |
| 3340 |
else if (!gAgent.mRRInterface.mContainsDefaultwear && gSavedSettings.getBOOL("RestrainedLifeAllowWear")) rez_attachment(item, NULL); |
else if (!gAgent.mRRInterface.mContainsDefaultwear && gSavedSettings.getBOOL("RestrainedLoveAllowWear")) rez_attachment(item, NULL); |
| 3341 |
|
|
| 3342 |
} |
} |
| 3343 |
} |
} |
| 3559 |
items.push_back(std::string("Object Wear")); |
items.push_back(std::string("Object Wear")); |
| 3560 |
//MK |
//MK |
| 3561 |
if (gRRenabled && gAgent.mRRInterface.mContainsDetach |
if (gRRenabled && gAgent.mRRInterface.mContainsDetach |
| 3562 |
&& (gAgent.mRRInterface.mContainsDefaultwear || !gSavedSettings.getBOOL("RestrainedLifeAllowWear")) |
&& (gAgent.mRRInterface.mContainsDefaultwear || !gSavedSettings.getBOOL("RestrainedLoveAllowWear")) |
| 3563 |
&& gAgent.mRRInterface.findAttachmentPointFromName (item->getName()) == NULL |
&& gAgent.mRRInterface.findAttachmentPointFromName (item->getName()) == NULL |
| 3564 |
&& gAgent.mRRInterface.findAttachmentPointFromParentName (item) == NULL) |
&& gAgent.mRRInterface.findAttachmentPointFromParentName (item) == NULL) |
| 3565 |
{ |
{ |
Parent Directory
| 
Revision Log
| 
Patch
