diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-30 09:07:39 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-30 09:07:39 -0400 |
| commit | dabdc89767c93f2ae9b10300eee87f94a79df707 (patch) | |
| tree | 759fd950243704af056fb815f337d1a5b66015cd | |
| parent | 8cef480b96dc779c5879f74224fb0a185ee550f2 (diff) | |
| parent | bdd053abcffea1f4c30421176d0a3749027c6b7d (diff) | |
merge
| -rw-r--r-- | .hgtags | 6 | ||||
| -rwxr-xr-x | indra/llcommon/llversionviewer.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfolderview.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 2 |
4 files changed, 20 insertions, 5 deletions
@@ -172,9 +172,13 @@ fb85792b84bf28428889c4cc966469d92e5dac4c 2.8.3-release 46a010f4885a9d223b511eac553ba5720284b1dc 3.0.0-start b0be6ce3adfef3a014a2389d360539f8a86c5439 DRTVWR-78_3.0.0-beta1 b0be6ce3adfef3a014a2389d360539f8a86c5439 3.0.0-beta1 -46a010f4885a9d223b511eac553ba5720284b1dc 3.0.0-start 6b678ea52f90d5c14181661dcd2546e25bde483e 3.0.0-start 82a2079ffcb57ecb1b3849cb41376b443e1eb912 3.0.1-start 364fd63517fbacbbcb9129d096187171ba8c9e48 DRTVWR-81_3.0.1-beta1 364fd63517fbacbbcb9129d096187171ba8c9e48 3.0.1-beta1 f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start +1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release +1778f26b6d0ae762dec3ca37140f66620f2485d9 3.0.0-release +42784bf50fa01974bada2a1af3892ee09c93fcda DRTVWR-83_3.0.2-beta1 +42784bf50fa01974bada2a1af3892ee09c93fcda 3.0.2-beta1 +b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 64225b859b..324507fe7a 100755 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 3; const S32 LL_VERSION_MINOR = 0; -const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 6461a5525e..ec162e00eb 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1912,9 +1912,20 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // when drop is not handled by child, it should be handled // by the folder which is the hierarchy root. - if (!handled && getListener()->getUUID().notNull()) + if (!handled) { - LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + if (getListener()->getUUID().notNull()) + { + LLFolderViewFolder::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + } + else + { + if (!mFolders.empty()) + { + // dispatch to last folder as a hack to support "Contents" folder in object inventory + handled = mFolders.back()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg); + } + } } if (handled) diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index b20f89aa7c..f00d6087f9 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -568,7 +568,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia else { requested_options.append("basic-mode"); - requested_options.append("inventory-basic"); + //requested_options.append("inventory-basic"); } #endif |