diff options
| author | simon <none@none> | 2013-08-05 12:03:00 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-05 12:03:00 -0700 |
| commit | b50f54db591dfe6cb5304b6b29d50c2066c69747 (patch) | |
| tree | aa365f653e3273b2d765bd689a9182b960dff376 /indra/newview/llinventorybridge.cpp | |
| parent | 570884d73007aea2438f3faa1181129a16bad359 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
Merge viewer-release with Vivox code
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); |