diff --git a/.hgpatchinfo/Appearance-Misc.dep b/.hgpatchinfo/Appearance-Misc.dep
new file mode 100644
index 0000000000000000000000000000000000000000..5cc1a8bd0f62d96a18e0424fb3dac1cba5fc1b07
--- /dev/null
+++ b/.hgpatchinfo/Appearance-Misc.dep
@@ -0,0 +1 @@
+c10aca90c7b1c46355536437d84a4b06abf79c5d
\ No newline at end of file
diff --git a/.hgpatchinfo/Appearance-Misc.desc b/.hgpatchinfo/Appearance-Misc.desc
new file mode 100644
index 0000000000000000000000000000000000000000..3ef1fb03d72ddb1f74c07f70132a57dde2cfcd25
--- /dev/null
+++ b/.hgpatchinfo/Appearance-Misc.desc
@@ -0,0 +1,27 @@
+[Appearance/Misc]
+- fixed : LLAppearanceMgr::filterWearableItems() doesn't properly filter body parts
+- fixed : LLWearableList::processGetAssetReply() creates multiple LLWearable instances for the same asset UUID
+ -> fix for http://jira.secondlife.com/browse/VWR-20608
+- fixed : attachments sometimes detach only to instantly get reattached after logon
+- fixed : Add to/Replace Outfit removes newly worn attachments on completion
+ -> fix for http://jira.secondlife.com/browse/VWR-18512
+- fixed : LLWearableBridge::removeAllClothesFromAvatar() doesn't remove all clothing from the avatar
+- fixed : attachments that attach and then instantly detach don't have their COF link removed
+- fixed : multiple LLWearableHoldingPattern instances lead to "COF corruption"
+- fixed : get_is_item_worn() shouldn't make the assumption that items in COFs are always worn
+- fixed : drag-and-drop wear behaviour of an attachment onto self isn't consistant with the drag-and-drop behaviour of wearables
+ -> normal-drop : replace wear
+ -> Ctrl-drop : add wear
+- fixed : LLAppearanceMgr::registerAttachment() fails to (re)add a link for worn attachments that aren't linked to in COF at log-on
+- fixed : LLViewerObject::getAttachmentItemID() sometimes returns the NULL UUID for the avatar's own attachments
+- fixed : LLAppearanceMgr::updateAppearanceFromCOF() doesn't properly filter items collected from folder links
+ -> create an outfit with a folder link + "Replace Outfit" == wearables that exist in both COF and the linked folder will end up worn multiple times
+- changed : deprecated removeItemFromAvatar() in favour of having LLAppearanceMgr::removeItemFromAvatar() handle it directly/correctly
+ -> wearables can't be worn/removed in 2.X without the viewer already having an LLWearable instance for it anyway
+- changed : enable "Replace Current Outfit" on the base outfit if it's marked dirty
+- changed : "RenderUnloadedAvatar" no longer affects the user's own avatar
+ -> side-effect of the fix above due to the change to LLVOAvatar::isFullyLoaded()
+- added : InitialWearablesLoadedSignal signal which is emitted *once* when the initial wearables are loaded
+- added : LegacyMultiAttachmentSupport debug setting to route "secondary attachment points" to the primary attachment point
+ -> maps secondary attachment point range [39,68] onto [1,30]
+ -> only dislays "secondary attachment points" correctly for *other* avatars (by design)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 15f1bbd1b173ae06b162548e316906200962b0d5..3d561e2172199890397775ca7198c6e439fde122 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4755,6 +4755,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>LegacyMultiAttachmentSupport</key>
+ <map>
+ <key>Comment</key>
+ <string>Converts legacy "secondary attachment points" to multi-attachments for other avatars</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>LimitDragDistance</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 729eb92e9470ab8d7656cfa71176d83ca04c82c6..9ded61436170e23a8c57107ab689235847765583 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -55,6 +55,9 @@
LLAgentWearables gAgentWearables;
BOOL LLAgentWearables::mInitialWearablesUpdateReceived = FALSE;
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-08-14 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+bool LLAgentWearables::mInitialWearablesLoaded = false;
+// [/SL:KB]
using namespace LLVOAvatarDefines;
@@ -1445,6 +1448,13 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
// Start rendering & update the server
mWearablesLoaded = TRUE;
checkWearablesLoaded();
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-09-22 (Catznip-3.0.0a) | Modified: Catznip-2.2.0a
+ if (!mInitialWearablesLoaded)
+ {
+ mInitialWearablesLoaded = true;
+ mInitialWearablesLoadedSignal();
+ }
+// [/SL:KB]
notifyLoadingFinished();
queryWearableCache();
updateServer();
@@ -1691,7 +1701,10 @@ void LLAgentWearables::userRemoveWearablesOfType(const LLWearableType::EType &ty
// Combines userRemoveAllAttachments() and userAttachMultipleAttachments() logic to
// get attachments into desired state with minimal number of adds/removes.
-void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array)
+//void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array)
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array, bool fAttachOnly)
+// [/SL:KB]
{
// Possible cases:
// already wearing but not in request set -> take off.
@@ -1756,7 +1769,13 @@ void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj
// llinfos << "remove " << remove_count << " add " << add_count << llendl;
// Remove everything in objects_to_remove
- userRemoveMultipleAttachments(objects_to_remove);
+// userRemoveMultipleAttachments(objects_to_remove);
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ if (!fAttachOnly)
+ {
+ userRemoveMultipleAttachments(objects_to_remove);
+ }
+// [/SL:KB]
// Add everything in items_to_add
userAttachMultipleAttachments(items_to_add);
@@ -2067,6 +2086,13 @@ boost::signals2::connection LLAgentWearables::addLoadedCallback(loaded_callback_
return mLoadedSignal.connect(cb);
}
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-08-14 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+boost::signals2::connection LLAgentWearables::addInitialWearablesLoadedCallback(loaded_callback_t cb)
+{
+ return mInitialWearablesLoadedSignal.connect(cb);
+}
+// [/SL:KB]
+
void LLAgentWearables::notifyLoadingStarted()
{
mCOFChangeInProgress = true;
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index 01cae3ffd86b1cb59b611655b2bf89d7c5cb434f..65951b3986a55699b7b92e487b4d2010c412ccd3 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -76,6 +76,9 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>
BOOL isWearableCopyable(LLWearableType::EType type, U32 index /*= 0*/) const;
BOOL areWearablesLoaded() const;
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-08-14 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+ bool areInitalWearablesLoaded() const { return mInitialWearablesLoaded; }
+// [/SL:KB]
bool isCOFChangeInProgress() const { return mCOFChangeInProgress; }
void updateWearablesLoaded();
void checkWearablesLoaded() const;
@@ -213,7 +216,11 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>
typedef std::vector<LLViewerObject*> llvo_vec_t;
- static void userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array);
+// static void userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array);
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ // Not the best way to go about this but other attempts changed far too much LL code to be a viable solution
+ static void userUpdateAttachments(LLInventoryModel::item_array_t& obj_item_array, bool fAttachOnly = false);
+// [/SL:KB]
static void userRemoveMultipleAttachments(llvo_vec_t& llvo_array);
static void userRemoveAllAttachments();
static void userAttachMultipleAttachments(LLInventoryModel::item_array_t& obj_item_array);
@@ -232,6 +239,9 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>
typedef boost::function<void()> loaded_callback_t;
typedef boost::signals2::signal<void()> loaded_signal_t;
boost::signals2::connection addLoadedCallback(loaded_callback_t cb);
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-08-14 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+ boost::signals2::connection addInitialWearablesLoadedCallback(loaded_callback_t cb);
+// [/SL:KB]
void notifyLoadingStarted();
void notifyLoadingFinished();
@@ -239,6 +249,9 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>
private:
loading_started_signal_t mLoadingStartedSignal; // should be called before wearables are changed
loaded_signal_t mLoadedSignal; // emitted when all agent wearables get loaded
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-08-14 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+ loaded_signal_t mInitialWearablesLoadedSignal; // emitted once when the initial wearables are loaded
+// [/SL:KB]
//--------------------------------------------------------------------
// Member variables
@@ -249,6 +262,9 @@ class LLAgentWearables : public LLInitClass<LLAgentWearables>
wearableentry_map_t mWearableDatas;
static BOOL mInitialWearablesUpdateReceived;
+// [SL:KB] - Patch: Appearance-InitialWearablesLoadedCallback | Checked: 2010-08-14 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ static bool mInitialWearablesLoaded;
+// [/SL:KB]
BOOL mWearablesLoaded;
std::set<LLUUID> mItemsAwaitingWearableUpdate;
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 0666d22f1001ef8bfa42582b0c5c5c75d6e1e825..d9c44a2be11f576076885ffb790f46e3c3fc49f8 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -286,11 +286,15 @@ class LLWearableHoldingPattern
void onWearableAssetFetch(LLWearable *wearable);
void onAllComplete();
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+ bool pollStopped();
+// [/SL:KB]
+
typedef std::list<LLFoundData> found_list_t;
found_list_t& getFoundList();
void eraseTypeToLink(LLWearableType::EType type);
void eraseTypeToRecover(LLWearableType::EType type);
- void setObjItems(const LLInventoryModel::item_array_t& items);
+// void setObjItems(const LLInventoryModel::item_array_t& items);
void setGestItems(const LLInventoryModel::item_array_t& items);
bool isMostRecent();
void handleLateArrivals();
@@ -298,7 +302,7 @@ class LLWearableHoldingPattern
private:
found_list_t mFoundList;
- LLInventoryModel::item_array_t mObjItems;
+// LLInventoryModel::item_array_t mObjItems;
LLInventoryModel::item_array_t mGestItems;
typedef std::set<S32> type_set_t;
type_set_t mTypesToRecover;
@@ -364,10 +368,11 @@ void LLWearableHoldingPattern::eraseTypeToRecover(LLWearableType::EType type)
mTypesToRecover.erase(type);
}
-void LLWearableHoldingPattern::setObjItems(const LLInventoryModel::item_array_t& items)
-{
- mObjItems = items;
-}
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-06-19 (Catznip-3.0.0a) | Added: Catznip-2.1.2a
+//void LLWearableHoldingPattern::setObjItems(const LLInventoryModel::item_array_t& items)
+//{
+// mObjItems = items;
+//}
void LLWearableHoldingPattern::setGestItems(const LLInventoryModel::item_array_t& items)
{
@@ -464,12 +469,13 @@ void LLWearableHoldingPattern::onAllComplete()
llinfos << "Updating agent wearables with " << mResolved << " wearable items " << llendl;
LLAppearanceMgr::instance().updateAgentWearables(this, false);
- // Update attachments to match those requested.
- if (isAgentAvatarValid())
- {
- llinfos << "Updating " << mObjItems.count() << " attachments" << llendl;
- LLAgentWearables::userUpdateAttachments(mObjItems);
- }
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-3.0.0a) | Added: Catznip-2.1.2a
+// // Update attachments to match those requested.
+// if (isAgentAvatarValid())
+// {
+// llinfos << "Updating " << mObjItems.count() << " attachments" << llendl;
+// LLAgentWearables::userUpdateAttachments(mObjItems);
+// }
if (isFetchCompleted() && isMissingCompleted())
{
@@ -499,6 +505,12 @@ bool LLWearableHoldingPattern::pollFetchCompletion()
if (!isMostRecent())
{
llwarns << "skipping because LLWearableHolding pattern is invalid (superceded by later outfit request)" << llendl;
+
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+ // If we were signalled to stop then we shouldn't do anything else except poll for when it's safe to delete ourselves
+ doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollStopped, this));
+ return true;
+// [/SL:KB]
}
bool completed = isFetchCompleted();
@@ -590,6 +602,11 @@ class RecoveredItemCB: public LLInventoryCallback
if (!mHolder->isMostRecent())
{
llwarns << "skipping because LLWearableHolding pattern is invalid (superceded by later outfit request)" << llendl;
+
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+ // If we were signalled to stop then we shouldn't do anything else except poll for when it's safe to delete ourselves
+ return;
+// [/SL:KB]
}
llinfos << "Recovered item for type " << mType << llendl;
@@ -664,11 +681,30 @@ void LLWearableHoldingPattern::clearCOFLinksForMissingWearables()
}
}
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+bool LLWearableHoldingPattern::pollStopped()
+{
+ // We have to keep on polling until we're sure that all callbacks have completed or they'll cause a crash
+ if ( (isFetchCompleted()) && (isMissingCompleted()) )
+ {
+ delete this;
+ return true;
+ }
+ return false;
+}
+// [/SL:KB]
+
bool LLWearableHoldingPattern::pollMissingWearables()
{
if (!isMostRecent())
{
llwarns << "skipping because LLWearableHolding pattern is invalid (superceded by later outfit request)" << llendl;
+
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+ // If we were signalled to stop then we shouldn't do anything else except poll for when it's safe to delete ourselves
+ doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollStopped, this));
+ return true;
+// [/SL:KB]
}
bool timed_out = isTimedOut();
@@ -1301,7 +1337,10 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
}
// Check whether it's the base outfit.
- if (outfit_cat_id.isNull() || outfit_cat_id == getBaseOutfitUUID())
+// if (outfit_cat_id.isNull() || outfit_cat_id == getBaseOutfitUUID())
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-09-21 (Catznip-3.0.0a) | Added: Catznip-2.1.2d
+ if ( (outfit_cat_id.isNull()) || ((outfit_cat_id == getBaseOutfitUUID()) && (!isOutfitDirty())) )
+// [/SL:KB]
{
return false;
}
@@ -1374,7 +1413,11 @@ void LLAppearanceMgr::filterWearableItems(
S32 size = items_by_type[i].size();
if (size <= 0)
continue;
- S32 start_index = llmax(0,size-max_per_type);
+// S32 start_index = llmax(0,size-max_per_type);
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-05-11 (Catznip-3.0.0a) | Added: Catznip-2.0.0h
+ S32 start_index =
+ llmax(0, size - ((LLAssetType::AT_BODYPART == LLWearableType::getAssetType((LLWearableType::EType)i)) ? 1 : max_per_type));
+// [/SL:KB[
for (S32 j = start_index; j<size; j++)
{
items.push_back(items_by_type[i][j]);
@@ -1702,10 +1745,45 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
remove_non_link_items(wear_items);
remove_non_link_items(obj_items);
remove_non_link_items(gest_items);
+// [SL:KB] - Patch: Apperance-Misc | Checked: 2010-11-24 (Catznip-3.0.0a) | Added: Catzip-2.4.0f
+ // Since we're following folder links we might have picked up new duplicates, or exceeded MAX_CLOTHING_PER_TYPE
+ removeDuplicateItems(wear_items);
+ removeDuplicateItems(obj_items);
+ removeDuplicateItems(gest_items);
+ filterWearableItems(wear_items, LLAgentWearables::MAX_CLOTHING_PER_TYPE);
+// [/SL:KB]
dumpItemArray(wear_items,"asset_dump: wear_item");
dumpItemArray(obj_items,"asset_dump: obj_item");
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ // Update attachments to match those requested.
+ if (isAgentAvatarValid())
+ {
+ // Include attachments which should be in COF but don't have their link created yet
+ uuid_vec_t::iterator itPendingAttachLink = mPendingAttachLinks.begin();
+ while (itPendingAttachLink != mPendingAttachLinks.end())
+ {
+ const LLUUID& idItem = *itPendingAttachLink;
+ if ( (!gAgentAvatarp->isWearingAttachment(idItem)) || (isLinkInCOF(idItem)) )
+ {
+ itPendingAttachLink = mPendingAttachLinks.erase(itPendingAttachLink);
+ continue;
+ }
+
+ LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
+ if (pItem)
+ obj_items.push_back(pItem);
+
+ ++itPendingAttachLink;
+ }
+
+ // Don't remove attachments until avatar is fully loaded (should reduce random attaching/detaching/reattaching at log-on)
+ llinfos << "Updating " << obj_items.count() << " attachments" << llendl;
+ LLAgentWearables::userUpdateAttachments(obj_items, !gAgentAvatarp->isFullyLoaded());
+ }
+// [/SL:KB]
+
if(!wear_items.count())
{
LLNotificationsUtil::add("CouldNotPutOnOutfit");
@@ -1718,7 +1796,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
LLWearableHoldingPattern* holder = new LLWearableHoldingPattern;
- holder->setObjItems(obj_items);
+// holder->setObjItems(obj_items);
holder->setGestItems(gest_items);
// Note: can't do normal iteration, because if all the
@@ -2613,11 +2691,27 @@ void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove)
switch (item_to_remove->getType())
{
case LLAssetType::AT_CLOTHING:
- if (get_is_item_worn(id_to_remove))
+// if (get_is_item_worn(id_to_remove))
+// {
+// //*TODO move here the exact removing code from LLWearableBridge::removeItemFromAvatar in the future
+// LLWearableBridge::removeItemFromAvatar(item_to_remove);
+// }
+// [SL:KB] - Patch: Appearance-RemoveWearableFromAvatar | Checked: 2010-08-13 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
{
- //*TODO move here the exact removing code from LLWearableBridge::removeItemFromAvatar in the future
- LLWearableBridge::removeItemFromAvatar(item_to_remove);
+ const LLWearable* pWearable = gAgentWearables.getWearableFromItemID(item_to_remove->getLinkedUUID());
+ if ( (pWearable) && (LLAssetType::AT_BODYPART != pWearable->getAssetType()) )
+ {
+ U32 idxWearable = gAgentWearables.getWearableIndex(pWearable);
+ if (idxWearable < LLAgentWearables::MAX_CLOTHING_PER_TYPE)
+ {
+ gAgentWearables.removeWearable(pWearable->getType(), false, idxWearable);
+
+ LLAppearanceMgr::instance().removeCOFItemLinks(item_to_remove->getLinkedUUID(), false);
+ gInventory.notifyObservers();
+ }
+ }
}
+// [/SL:KB]
break;
case LLAssetType::AT_OBJECT:
LLVOAvatarSelf::detachAttachmentIntoInventory(item_to_remove->getLinkedUUID());
@@ -2763,6 +2857,12 @@ void LLAppearanceMgr::setAttachmentInvLinkEnable(bool val)
{
llinfos << "setAttachmentInvLinkEnable => " << (int) val << llendl;
mAttachmentInvLinkEnabled = val;
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-10-05 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ if (mAttachmentInvLinkEnabled)
+ {
+ linkPendingAttachments();
+ }
+// [/SL:KB]
}
void dumpAttachmentSet(const std::set<LLUUID>& atts, const std::string& msg)
@@ -2785,13 +2885,24 @@ void dumpAttachmentSet(const std::set<LLUUID>& atts, const std::string& msg)
void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
{
gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-10-05 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ if (isLinkInCOF(item_id))
+ {
+ return;
+ }
+ mPendingAttachLinks.push_back(item_id);
+// [/SL:KB]
if (mAttachmentInvLinkEnabled)
{
// we have to pass do_update = true to call LLAppearanceMgr::updateAppearanceFromCOF.
// it will trigger gAgentWariables.notifyLoadingFinished()
// But it is not acceptable solution. See EXT-7777
- LLAppearanceMgr::addCOFItemLink(item_id, false); // Add COF link for item.
+// LLAppearanceMgr::addCOFItemLink(item_id, false); // Add COF link for item.
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-10-05 (Catznip-3.0.0a) | Modified: Catznip-2.2.0a
+ LLPointer<LLInventoryCallback> cb = new LLRegisterAttachmentCallback();
+ LLAppearanceMgr::addCOFItemLink(item_id, false, cb); // Add COF link for item.
+// [/SL:KB]
}
else
{
@@ -2802,6 +2913,13 @@ void LLAppearanceMgr::registerAttachment(const LLUUID& item_id)
void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
{
gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id);
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-10-05 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ uuid_vec_t::iterator itPendingAttachLink = std::find(mPendingAttachLinks.begin(), mPendingAttachLinks.end(), item_id);
+ if (itPendingAttachLink != mPendingAttachLinks.end())
+ {
+ mPendingAttachLinks.erase(itPendingAttachLink);
+ }
+// [/SL:KB]
if (mAttachmentInvLinkEnabled)
{
@@ -2813,6 +2931,38 @@ void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id)
}
}
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-18 (Catznip-3.0.0a) | Modified: Catznip-2.2.0a
+void LLAppearanceMgr::linkPendingAttachments()
+{
+ LLPointer<LLInventoryCallback> cb = NULL;
+ for (uuid_vec_t::const_iterator itPendingAttachLink = mPendingAttachLinks.begin();
+ itPendingAttachLink != mPendingAttachLinks.end(); ++itPendingAttachLink)
+ {
+ const LLUUID& idAttachItem = *itPendingAttachLink;
+ if ( (gAgentAvatarp->isWearingAttachment(idAttachItem)) && (!isLinkInCOF(idAttachItem)) )
+ {
+ if (!cb)
+ cb = new LLRegisterAttachmentCallback();
+ LLAppearanceMgr::addCOFItemLink(idAttachItem, false, cb);
+ }
+ }
+}
+
+void LLAppearanceMgr::onRegisterAttachmentComplete(const LLUUID& idItem)
+{
+ const LLUUID& idItemBase = gInventory.getLinkedItemID(idItem);
+
+ // Remove the attachment from the pending list
+ uuid_vec_t::iterator itPendingAttachLink = std::find(mPendingAttachLinks.begin(), mPendingAttachLinks.end(), idItemBase);
+ if (itPendingAttachLink != mPendingAttachLinks.end())
+ mPendingAttachLinks.erase(itPendingAttachLink);
+
+ // It may have been detached already in which case we should remove the COF link
+ if ( (isAgentAvatarValid()) && (!gAgentAvatarp->isWearingAttachment(idItemBase)) )
+ removeCOFItemLinks(idItemBase, false);
+}
+// [/SL:KB]
+
BOOL LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
{
return gInventory.isObjectDescendentOf(obj_id, getCOF());
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index c1d561781d21f947f00b540480f7d3571add79df..53ff2ec7ce66f21e7220ddb39a612f0dc0ec31b6 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -220,6 +220,14 @@ class LLAppearanceMgr: public LLSingleton<LLAppearanceMgr>
std::auto_ptr<LLOutfitUnLockTimer> mUnlockOutfitTimer;
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-18 (Catznip-3.0.0a) | Modified: Catznip-2.1.2e
+public:
+ void linkPendingAttachments();
+ void onRegisterAttachmentComplete(const LLUUID& idItem);
+private:
+ uuid_vec_t mPendingAttachLinks;
+// [/SL:KB]
+
//////////////////////////////////////////////////////////////////////////////////
// Item-specific convenience functions
public:
@@ -246,6 +254,16 @@ class LLUpdateAppearanceOnDestroy: public LLInventoryCallback
bool mUpdateBaseOrder;
};
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-08-31 (Catznip-3.0.0a) | Added: Catznip-2.1.2a
+class LLRegisterAttachmentCallback : public LLInventoryCallback
+{
+public:
+ /*virtual*/ void fire(const LLUUID& idItem)
+ {
+ LLAppearanceMgr::instance().onRegisterAttachmentComplete(idItem);
+ }
+};
+// [/SL:KB]
#define SUPPORT_ENSEMBLES 0
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a36aa3dedf9ba5186d9961082d100cc773ad82ff..535b9f596b7a0287a04d26baaa4b4a8e782cf4df 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2743,6 +2743,9 @@ void LLFolderBridge::folderOptionsMenu()
// BAP change once we're no longer treating regular categories as ensembles.
const bool is_ensemble = (type == LLFolderType::FT_NONE ||
LLFolderType::lookupIsEnsembleType(type));
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-11-24 (Catznip-3.0.0a) | Added: Catznip-2.4.0e
+ const bool is_outfit = (type == LLFolderType::FT_OUTFIT);
+// [/SL:KB]
// Only enable calling-card related options for non-system folders.
if (!is_system_folder)
@@ -2801,7 +2804,11 @@ void LLFolderBridge::folderOptionsMenu()
{
mDisabledItems.push_back(std::string("Remove From Outfit"));
}
- if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
+// if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-11-24 (Catznip-3.0.0a) | Added: Catznip-2.4.0e
+ if ( ((is_outfit) && (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))) ||
+ ((!is_outfit) && (gAgentWearables.isCOFChangeInProgress())) )
+// [/SL:KB]
{
mDisabledItems.push_back(std::string("Replace Outfit"));
}
@@ -4786,14 +4793,14 @@ void remove_inventory_category_from_avatar( LLInventoryCategory* category )
remove_inventory_category_from_avatar_step2(TRUE, category->getUUID() );
}
-struct OnRemoveStruct
-{
- LLUUID mUUID;
- OnRemoveStruct(const LLUUID& uuid):
- mUUID(uuid)
- {
- }
-};
+//struct OnRemoveStruct
+//{
+// LLUUID mUUID;
+// OnRemoveStruct(const LLUUID& uuid):
+// mUUID(uuid)
+// {
+// }
+//};
void remove_inventory_category_from_avatar_step2( BOOL proceed, LLUUID category_id)
{
@@ -4846,11 +4853,14 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, LLUUID category_
continue;
if (get_is_item_worn(item->getUUID()))
{
- LLWearableList::instance().getAsset(item->getAssetUUID(),
- item->getName(),
- item->getType(),
- LLWearableBridge::onRemoveFromAvatarArrived,
- new OnRemoveStruct(item->getLinkedUUID()));
+// LLWearableList::instance().getAsset(item->getAssetUUID(),
+// item->getName(),
+// item->getType(),
+// LLWearableBridge::onRemoveFromAvatarArrived,
+// new OnRemoveStruct(item->getLinkedUUID()));
+// [SL:KB] - Patch: Appearance-RemoveWearableFromAvatar | Checked: 2010-08-13 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+ LLAppearanceMgr::instance().removeItemFromAvatar(item->getUUID());
+// [/SL:KB]
}
}
}
@@ -5093,56 +5103,56 @@ void LLWearableBridge::wearAddOnAvatar()
}
// static
-void LLWearableBridge::onWearOnAvatarArrived( LLWearable* wearable, void* userdata )
-{
- LLUUID* item_id = (LLUUID*) userdata;
- if(wearable)
- {
- LLViewerInventoryItem* item = NULL;
- item = (LLViewerInventoryItem*)gInventory.getItem(*item_id);
- if(item)
- {
- if(item->getAssetUUID() == wearable->getAssetID())
- {
- gAgentWearables.setWearableItem(item, wearable);
- gInventory.notifyObservers();
- //self->getFolderItem()->refreshFromRoot();
- }
- else
- {
- llinfos << "By the time wearable asset arrived, its inv item already pointed to a different asset." << llendl;
- }
- }
- }
- delete item_id;
-}
+//void LLWearableBridge::onWearOnAvatarArrived( LLWearable* wearable, void* userdata )
+//{
+// LLUUID* item_id = (LLUUID*) userdata;
+// if(wearable)
+// {
+// LLViewerInventoryItem* item = NULL;
+// item = (LLViewerInventoryItem*)gInventory.getItem(*item_id);
+// if(item)
+// {
+// if(item->getAssetUUID() == wearable->getAssetID())
+// {
+// gAgentWearables.setWearableItem(item, wearable);
+// gInventory.notifyObservers();
+// //self->getFolderItem()->refreshFromRoot();
+// }
+// else
+// {
+// llinfos << "By the time wearable asset arrived, its inv item already pointed to a different asset." << llendl;
+// }
+// }
+// }
+// delete item_id;
+//}
// static
// BAP remove the "add" code path once everything is fully COF-ified.
-void LLWearableBridge::onWearAddOnAvatarArrived( LLWearable* wearable, void* userdata )
-{
- LLUUID* item_id = (LLUUID*) userdata;
- if(wearable)
- {
- LLViewerInventoryItem* item = NULL;
- item = (LLViewerInventoryItem*)gInventory.getItem(*item_id);
- if(item)
- {
- if(item->getAssetUUID() == wearable->getAssetID())
- {
- bool do_append = true;
- gAgentWearables.setWearableItem(item, wearable, do_append);
- gInventory.notifyObservers();
- //self->getFolderItem()->refreshFromRoot();
- }
- else
- {
- llinfos << "By the time wearable asset arrived, its inv item already pointed to a different asset." << llendl;
- }
- }
- }
- delete item_id;
-}
+//void LLWearableBridge::onWearAddOnAvatarArrived( LLWearable* wearable, void* userdata )
+//{
+// LLUUID* item_id = (LLUUID*) userdata;
+// if(wearable)
+// {
+// LLViewerInventoryItem* item = NULL;
+// item = (LLViewerInventoryItem*)gInventory.getItem(*item_id);
+// if(item)
+// {
+// if(item->getAssetUUID() == wearable->getAssetID())
+// {
+// bool do_append = true;
+// gAgentWearables.setWearableItem(item, wearable, do_append);
+// gInventory.notifyObservers();
+// //self->getFolderItem()->refreshFromRoot();
+// }
+// else
+// {
+// llinfos << "By the time wearable asset arrived, its inv item already pointed to a different asset." << llendl;
+// }
+// }
+// }
+// delete item_id;
+//}
// static
BOOL LLWearableBridge::canEditOnAvatar(void* user_data)
@@ -5180,53 +5190,53 @@ BOOL LLWearableBridge::canRemoveFromAvatar(void* user_data)
}
// static
-void LLWearableBridge::onRemoveFromAvatar(void* user_data)
-{
- LLWearableBridge* self = (LLWearableBridge*)user_data;
- if(!self) return;
- if(get_is_item_worn(self->mUUID))
- {
- LLViewerInventoryItem* item = self->getItem();
- if (item)
- {
- LLUUID parent_id = item->getParentUUID();
- LLWearableList::instance().getAsset(item->getAssetUUID(),
- item->getName(),
- item->getType(),
- onRemoveFromAvatarArrived,
- new OnRemoveStruct(LLUUID(self->mUUID)));
- }
- }
-}
+//void LLWearableBridge::onRemoveFromAvatar(void* user_data)
+//{
+// LLWearableBridge* self = (LLWearableBridge*)user_data;
+// if(!self) return;
+// if(get_is_item_worn(self->mUUID))
+// {
+// LLViewerInventoryItem* item = self->getItem();
+// if (item)
+// {
+// LLUUID parent_id = item->getParentUUID();
+// LLWearableList::instance().getAsset(item->getAssetUUID(),
+// item->getName(),
+// item->getType(),
+// onRemoveFromAvatarArrived,
+// new OnRemoveStruct(LLUUID(self->mUUID)));
+// }
+// }
+//}
// static
-void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable,
- void* userdata)
-{
- OnRemoveStruct *on_remove_struct = (OnRemoveStruct*) userdata;
- const LLUUID &item_id = gInventory.getLinkedItemID(on_remove_struct->mUUID);
- if(wearable)
- {
- if( get_is_item_worn( item_id ) )
- {
- LLWearableType::EType type = wearable->getType();
-
- if( !(type==LLWearableType::WT_SHAPE || type==LLWearableType::WT_SKIN || type==LLWearableType::WT_HAIR || type==LLWearableType::WT_EYES ) ) //&&
- //!((!gAgent.isTeen()) && ( type==LLWearableType::WT_UNDERPANTS || type==LLWearableType::WT_UNDERSHIRT )) )
- {
- bool do_remove_all = false;
- U32 index = gAgentWearables.getWearableIndex(wearable);
- gAgentWearables.removeWearable( type, do_remove_all, index );
- }
- }
- }
-
- // Find and remove this item from the COF.
- LLAppearanceMgr::instance().removeCOFItemLinks(item_id,false);
- gInventory.notifyObservers();
-
- delete on_remove_struct;
-}
+//void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable,
+// void* userdata)
+//{
+// OnRemoveStruct *on_remove_struct = (OnRemoveStruct*) userdata;
+// const LLUUID &item_id = gInventory.getLinkedItemID(on_remove_struct->mUUID);
+// if(wearable)
+// {
+// if( get_is_item_worn( item_id ) )
+// {
+// LLWearableType::EType type = wearable->getType();
+//
+// if( !(type==LLWearableType::WT_SHAPE || type==LLWearableType::WT_SKIN || type==LLWearableType::WT_HAIR || type==LLWearableType::WT_EYES ) ) //&&
+// //!((!gAgent.isTeen()) && ( type==LLWearableType::WT_UNDERPANTS || type==LLWearableType::WT_UNDERSHIRT )) )
+// {
+// bool do_remove_all = false;
+// U32 index = gAgentWearables.getWearableIndex(wearable);
+// gAgentWearables.removeWearable( type, do_remove_all, index );
+// }
+// }
+// }
+//
+// // Find and remove this item from the COF.
+// LLAppearanceMgr::instance().removeCOFItemLinks(item_id,false);
+// gInventory.notifyObservers();
+//
+// delete on_remove_struct;
+//}
// static
void LLWearableBridge::removeAllClothesFromAvatar()
@@ -5254,11 +5264,14 @@ void LLWearableBridge::removeItemFromAvatar(LLViewerInventoryItem *item)
{
if (item)
{
- LLWearableList::instance().getAsset(item->getAssetUUID(),
- item->getName(),
- item->getType(),
- LLWearableBridge::onRemoveFromAvatarArrived,
- new OnRemoveStruct(item->getUUID()));
+// LLWearableList::instance().getAsset(item->getAssetUUID(),
+// item->getName(),
+// item->getType(),
+// LLWearableBridge::onRemoveFromAvatarArrived,
+// new OnRemoveStruct(item->getUUID()));
+// [SL:KB] - Patch: Appearance-RemoveWearableFromAvatar | Checked: 2010-08-13 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+ LLAppearanceMgr::instance().removeItemFromAvatar(item->getUUID());
+// [/SL:KB]
}
}
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 2d625befb4cff555fb26f94ad01e3de584016aba..c9675885f9c09cc82a2be77ee4d72050d9526f0e 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -484,10 +484,10 @@ class LLWearableBridge : public LLItemBridge
static void onWearOnAvatar( void* userdata ); // Access to wearOnAvatar() from menu
static BOOL canWearOnAvatar( void* userdata );
- static void onWearOnAvatarArrived( LLWearable* wearable, void* userdata );
+// static void onWearOnAvatarArrived( LLWearable* wearable, void* userdata );
void wearOnAvatar();
- static void onWearAddOnAvatarArrived( LLWearable* wearable, void* userdata );
+// static void onWearAddOnAvatarArrived( LLWearable* wearable, void* userdata );
void wearAddOnAvatar();
static BOOL canEditOnAvatar( void* userdata ); // Access to editOnAvatar() from menu
@@ -495,8 +495,8 @@ class LLWearableBridge : public LLItemBridge
void editOnAvatar();
static BOOL canRemoveFromAvatar( void* userdata );
- static void onRemoveFromAvatar( void* userdata );
- static void onRemoveFromAvatarArrived( LLWearable* wearable, void* userdata );
+// static void onRemoveFromAvatar( void* userdata );
+// static void onRemoveFromAvatarArrived( LLWearable* wearable, void* userdata );
static void removeItemFromAvatar(LLViewerInventoryItem *item);
static void removeAllClothesFromAvatar();
void removeFromAvatar();
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 0af013fde5ec25d9c738d988a3cede632bdf9239..57b6242fd498a8f788ff9c75ca6152da4e4ab307 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -270,10 +270,11 @@ BOOL get_is_item_worn(const LLUUID& id)
return FALSE;
// Consider the item as worn if it has links in COF.
- if (LLAppearanceMgr::instance().isLinkInCOF(id))
- {
- return TRUE;
- }
+// [SL:KB] - The code below causes problems across the board so it really just needs to go
+// if (LLAppearanceMgr::instance().isLinkInCOF(id))
+// {
+// return TRUE;
+// }
switch(item->getType())
{
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 3e5ce427a80dfbe2551c8a51593ace4ad7fe85a8..c6eb581dcb9010976d04c36560e0e21ea29393a0 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1663,7 +1663,11 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
{
if(mSource == SOURCE_LIBRARY)
{
- LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(0);
+// LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(0);
+// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ // Make this behave consistent with dad3dWearItem
+ LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(0, !(mask & MASK_CONTROL));
+// [/SL:KB]
copy_inventory_item(
gAgent.getID(),
item->getPermissions().getOwner(),
@@ -1674,7 +1678,11 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
}
else
{
- rez_attachment(item, 0);
+// rez_attachment(item, 0);
+// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ // Make this behave consistent with dad3dWearItem
+ rez_attachment(item, 0, !(mask & MASK_CONTROL));
+// [/SL:KB]
}
}
return ACCEPT_YES_SINGLE;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index b22c6d2fd4acf5bf630a0a5dadf7fe370ea7ce3f..aaaf46d20ea71feb44acc55bda5ddfd09a57a2c0 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -984,9 +984,13 @@ void ModifiedCOFCallback::fire(const LLUUID& inv_item)
}
}
-RezAttachmentCallback::RezAttachmentCallback(LLViewerJointAttachment *attachmentp)
+//RezAttachmentCallback::RezAttachmentCallback(LLViewerJointAttachment *attachmentp)
+// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+RezAttachmentCallback::RezAttachmentCallback(LLViewerJointAttachment *attachmentp, bool replace)
+ : mAttach(attachmentp), mReplace(replace)
+// [/SL:KB]
{
- mAttach = attachmentp;
+// mAttach = attachmentp;
}
RezAttachmentCallback::~RezAttachmentCallback()
{
@@ -1000,7 +1004,10 @@ void RezAttachmentCallback::fire(const LLUUID& inv_item)
LLViewerInventoryItem *item = gInventory.getItem(inv_item);
if (item)
{
- rez_attachment(item, mAttach);
+// rez_attachment(item, mAttach);
+// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ rez_attachment(item, mAttach, mReplace);
+// [/SL:KB]
}
}
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 41542a4e0ff9a20bd51043a8a1f9052ccc8835cc..45faca8d93829971956908bb385ef4e5d5643c1e 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -263,7 +263,10 @@ class LLViewerJointAttachment;
class RezAttachmentCallback : public LLInventoryCallback
{
public:
- RezAttachmentCallback(LLViewerJointAttachment *attachmentp);
+// RezAttachmentCallback(LLViewerJointAttachment *attachmentp);
+// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ RezAttachmentCallback(LLViewerJointAttachment *attachmentp, bool replace = false);
+// [/SL:KB]
void fire(const LLUUID& inv_item);
protected:
@@ -271,6 +274,9 @@ class RezAttachmentCallback : public LLInventoryCallback
private:
LLViewerJointAttachment* mAttach;
+// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ bool mReplace;
+// [/SL:KB]
};
class ActivateGestureCallback : public LLInventoryCallback
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index 4e14824e69a3f726c575037a80eae56c93ad486c..3004c717efab5758f6591821943c4aea278f1645 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -158,7 +158,7 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)
//-----------------------------------------------------------------------------
BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
{
- object->extractAttachmentItemID();
+// object->extractAttachmentItemID();
// Same object reattached
if (isObjectAttached(object))
@@ -169,6 +169,11 @@ BOOL LLViewerJointAttachment::addObject(LLViewerObject* object)
// re-connect object to the joint correctly
}
+// [SL:KB] - Patch: Appearance-Misc | Checked: Catznip-3.0.0a (2011-01-13) | Added: Catznip-2.4.0h
+ // LLViewerJointAttachment::removeObject() sets the object's item to the NULL UUID so we need to extract it *after* the block above
+ object->extractAttachmentItemID();
+// [/SL:KB]
+
// Two instances of the same inventory item attached --
// Request detach, and kill the object in the meantime.
if (getAttachedObject(object->getAttachmentItemID()))
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bdab250b49c5db324149bdb17a1bcae838e3ec05..bf8eb72970f626eb6de9abeac786adffb3708ccc 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5964,7 +5964,13 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi
if (!attachment)
{
llwarns << "Object attachment point invalid: " << attachmentID << llendl;
- attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest)
+// attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest)
+// [SL:KB] - Patch: Appearance-LegacyMultiAttachment | Checked: 2010-08-28 (Catznip-3.0.0a) | Added: Catznip-2.1.2a
+ S32 idxAttachPt = 1;
+ if ( (!isSelf()) && (gSavedSettings.getBOOL("LegacyMultiAttachmentSupport")) && (attachmentID > 38) && (attachmentID <= 68) )
+ idxAttachPt = attachmentID - 38;
+ attachment = get_if_there(mAttachmentPoints, idxAttachPt, (LLViewerJointAttachment*)NULL);
+// [/SL:KB]
}
return attachment;
@@ -6485,10 +6491,17 @@ BOOL LLVOAvatar::processFullyLoadedChange(bool loading)
BOOL LLVOAvatar::isFullyLoaded() const
{
- if (gSavedSettings.getBOOL("RenderUnloadedAvatar"))
+// if (gSavedSettings.getBOOL("RenderUnloadedAvatar"))
+// return TRUE;
+// else
+// return mFullyLoaded;
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+ // Changes to LLAppearanceMgr::updateAppearanceFromCOF() expect this function to actually return mFullyLoaded for gAgentAvatarp
+ if ( (!isSelf()) && (gSavedSettings.getBOOL("RenderUnloadedAvatar")) )
return TRUE;
else
return mFullyLoaded;
+// [/SL:KB]
}
bool LLVOAvatar::isTooComplex() const
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
index ddbcdfc3f7a2d35f4182f0208b20a0a681091621..450e91fc16c4675957f3aa379b1e98ae6c5a50c5 100644
--- a/indra/newview/llwearablelist.cpp
+++ b/indra/newview/llwearablelist.cpp
@@ -95,8 +95,18 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
{
BOOL isNewWearable = FALSE;
LLWearableArrivedData* data = (LLWearableArrivedData*) userdata;
- LLWearable* wearable = NULL; // NULL indicates failure
-
+// LLWearable* wearable = NULL; // NULL indicates failure
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-08-13 (Catznip-3.0.0a) | Added: Catznip-2.1.1d
+ LLWearable* wearable = get_if_there(LLWearableList::instance().mList, uuid, (LLWearable*)NULL);
+ if (wearable)
+ {
+ if(data->mCallback)
+ data->mCallback(wearable, data->mUserdata);
+ delete data;
+ return;
+ }
+// [/SL:KB]
+
if( !filename )
{
LL_WARNS("Wearable") << "Bad Wearable Asset: missing file." << LL_ENDL;