summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-05 15:27:05 -0400
committerOz Linden <oz@lindenlab.com>2013-08-05 15:27:05 -0400
commit629bda7cf371f2eb2e7fc9adbfd123d5a079093e (patch)
treed4fe34589117786ba491583e83c533487552b1f6 /indra/newview/llinventorybridge.cpp
parentfe69b4049bdbdf36a179ccc28a2f253af13e61c5 (diff)
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
merge changes for 3.6.2-release
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rwxr-xr-xindra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a5043a30ac..e4fc469bb7 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3444,7 +3444,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
}
}
- //Added by spatters to force inventory pull on right-click to display folder options correctly. 07-17-06
+ //Added by aura to force inventory pull on right-click to display folder options correctly. 07-17-06
mCallingCards = mWearables = FALSE;
LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD);