diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-08-08 09:26:36 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-08-08 09:26:36 -0700 |
| commit | e0cc3cbd977dcfbe4ef8409b8484a30b2c63dcc1 (patch) | |
| tree | d96e036d18bae1ddd3704b4abd55fe6565844d80 /indra/newview/llinventorybridge.cpp | |
| parent | 6354ad379d0850b4cc3969130fb1b30b0e2c0ee9 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
Merge with 3.6.2-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); |