diff options
| author | simon <none@none> | 2013-08-05 14:50:40 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-05 14:50:40 -0700 |
| commit | 71e2efab169af5d56f8c5416874d2f7c491f01f1 (patch) | |
| tree | 374b1aa2f3dcdcaed452b64307da235cafb76756 /indra/newview/llinventorybridge.cpp | |
| parent | ee25146ce4cac282d70b8cc32d58613e31f197f9 (diff) | |
| parent | b50f54db591dfe6cb5304b6b29d50c2066c69747 (diff) | |
Merge downstream code - Vivox release
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 2 |
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); |