From 863d9bdc501139e668da37b7242d165f76fd2399 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 26 Aug 2011 12:57:16 -0700 Subject: EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a prim in latest Mesh build 239475 brought back some old logic for dispatching to child folder as drag and drop fallback --- indra/newview/llfolderview.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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) -- cgit v1.2.3 From 5a6f07ab6425a8f0f4b3563800333b8cb3209cbf Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 26 Aug 2011 14:01:30 -0700 Subject: disabled basic inventory root creation reviewed by Stone --- indra/newview/lllogininstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 user_credentia else { requested_options.append("basic-mode"); - requested_options.append("inventory-basic"); + //requested_options.append("inventory-basic"); } #endif -- cgit v1.2.3 From ebb55355ebbe6ec6760d8683e461903957ed24e5 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Sun, 28 Aug 2011 10:41:31 -0400 Subject: Added tag DRTVWR-78_3.0.0-release, 3.0.0-release for changeset 1778f26b6d0a --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index fe56285432..650be404d3 100644 --- a/.hgtags +++ b/.hgtags @@ -172,3 +172,5 @@ fb85792b84bf28428889c4cc966469d92e5dac4c 2.8.3-release 46a010f4885a9d223b511eac553ba5720284b1dc 3.0.0-start b0be6ce3adfef3a014a2389d360539f8a86c5439 DRTVWR-78_3.0.0-beta1 b0be6ce3adfef3a014a2389d360539f8a86c5439 3.0.0-beta1 +1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release +1778f26b6d0ae762dec3ca37140f66620f2485d9 3.0.0-release -- cgit v1.2.3 From a5e0bbab4a151e52aa1fa1024820c6e6402bc30a Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Sun, 28 Aug 2011 14:17:02 -0400 Subject: Added tag DRTVWR-83_3.0.2-beta1, 3.0.2-beta1 for changeset 42784bf50fa0 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index b001151866..7bf2b04e17 100644 --- a/.hgtags +++ b/.hgtags @@ -179,3 +179,5 @@ b0be6ce3adfef3a014a2389d360539f8a86c5439 3.0.0-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 -- cgit v1.2.3 From 68a15f73c190d2a803ad8b11ed8d9b32bc9e46ee Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 29 Aug 2011 09:26:53 -0400 Subject: Added tag 3.0.3-start for changeset b95ddac176ac --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 7bf2b04e17..f79bd158f9 100644 --- a/.hgtags +++ b/.hgtags @@ -181,3 +181,4 @@ f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start 1778f26b6d0ae762dec3ca37140f66620f2485d9 3.0.0-release 42784bf50fa01974bada2a1af3892ee09c93fcda DRTVWR-83_3.0.2-beta1 42784bf50fa01974bada2a1af3892ee09c93fcda 3.0.2-beta1 +b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start -- cgit v1.2.3 From bdd053abcffea1f4c30421176d0a3749027c6b7d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 29 Aug 2011 09:27:25 -0400 Subject: increment viewer version to 3.0.4 --- indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; -- cgit v1.2.3