From e8196ca93f24644998777da6b2286920c7709cbe Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 18:38:15 +0800
Subject: [PATCH 1/4] EXT-2313 Add auto-close behavior to mini-inspector
 floater

---
 indra/newview/app_settings/settings.xml | 13 ++++++++++++-
 indra/newview/llinspect.cpp             | 21 +++++++++++++++++----
 indra/newview/llinspect.h               |  3 +++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d9607e5f6b..fb1aac6e95 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3706,7 +3706,18 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>0.15</real>
+      <real>0.5</real>
+    </map> 
+	<key>InspectorShowTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Stay timing for inspectors</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>3.0</real>
     </map> 
     <key>InstallLanguage</key>
     <map>
diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
index aa299014ee..c7b8db9635 100644
--- a/indra/newview/llinspect.cpp
+++ b/indra/newview/llinspect.cpp
@@ -50,16 +50,16 @@ LLInspect::~LLInspect()
 void LLInspect::draw()
 {
 	static LLCachedControl<F32> FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f);
+	static LLCachedControl<F32> STAY_TIME(*LLUI::sSettingGroups["config"], "InspectorShowTime", 1.f);
 	if (mOpenTimer.getStarted())
 	{
-		F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f);
-		LLViewDrawContext context(alpha);
 		LLFloater::draw();
-		if (alpha == 1.f)
+		if (mOpenTimer.getElapsedTimeF32() > STAY_TIME)
 		{
 			mOpenTimer.stop();
+			mCloseTimer.start();
 		}
-		
+
 	}
 	else if (mCloseTimer.getStarted())
 	{
@@ -95,3 +95,16 @@ void LLInspect::onFocusLost()
 	mCloseTimer.start();
 	mOpenTimer.stop();
 }
+
+// virtual
+BOOL LLInspect::handleHover(S32 x, S32 y, MASK mask)
+{
+	mOpenTimer.pause();
+	return LLView::handleHover(x, y, mask);
+}
+
+// virtual
+void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	mOpenTimer.unpause();
+}
diff --git a/indra/newview/llinspect.h b/indra/newview/llinspect.h
index a461c2fa16..731e99534b 100644
--- a/indra/newview/llinspect.h
+++ b/indra/newview/llinspect.h
@@ -46,6 +46,9 @@ public:
 	/// Inspectors have a custom fade-in/fade-out animation
 	/*virtual*/ void draw();
 	
+	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+	
 	/// Start open animation
 	/*virtual*/ void onOpen(const LLSD& avatar_id);
 	

From a28de873cea85bdedcac20a164d7bd2012a4d5bc Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Thu, 3 Dec 2009 22:28:53 +0800
Subject: [PATCH 2/4]  EXT-2575 [BSI] Deleting content inside a prim from build
 floater deletes prim, rather than content

---
 indra/newview/llpanelobjectinventory.cpp      | 20 +++++++++++++++++++
 indra/newview/llpanelobjectinventory.h        |  3 +++
 .../skins/default/xui/en/menu_text_editor.xml |  8 ++++----
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 342d2bc739..7b0eb8c2d2 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1695,6 +1695,7 @@ void LLPanelObjectInventory::updateInventory()
 	}
 
 	mFolders->requestArrange();
+	//LLEditMenuHandler::gEditMenuHandler = mFolders;
 	mInventoryNeedsUpdate = FALSE;
 }
 
@@ -1940,3 +1941,22 @@ void LLPanelObjectInventory::idle(void* user_data)
 		self->updateInventory();
 	}
 }
+
+void LLPanelObjectInventory::onFocusLost()
+{
+	// inventory no longer handles cut/copy/paste/delete
+	if (LLEditMenuHandler::gEditMenuHandler == mFolders)
+	{
+		LLEditMenuHandler::gEditMenuHandler = NULL;
+	}
+	
+	LLPanel::onFocusLost();
+}
+
+void LLPanelObjectInventory::onFocusReceived()
+{
+	// inventory now handles cut/copy/paste/delete
+	LLEditMenuHandler::gEditMenuHandler = mFolders;
+	
+	LLPanel::onFocusReceived();
+}
\ No newline at end of file
diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
index 6722bb212e..bc339ece35 100644
--- a/indra/newview/llpanelobjectinventory.h
+++ b/indra/newview/llpanelobjectinventory.h
@@ -74,6 +74,9 @@ public:
 	virtual void deleteAllChildren();
 	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
 	
+	/*virtual*/ void onFocusLost();
+	/*virtual*/ void onFocusReceived();
+	
 	static void idle(void* user_data);
 
 protected:
diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
index 7c9e6f0796..ecd96088e7 100644
--- a/indra/newview/skins/default/xui/en/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml
@@ -32,10 +32,10 @@
      function="Edit.EnablePaste" />
   </menu_item_call>
   <menu_item_call
- label="Delete"
- layout="topleft"
- name="Delete"
- shortcut="Del">
+   label="Delete"
+   layout="topleft"
+   name="Delete"
+   shortcut="Del">
     <menu_item_call.on_click
      function="Edit.Delete" />
     <menu_item_call.on_enable

From 59b4d01a0c2f46ac305d3737763ee13f00294dec Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 4 Dec 2009 12:26:46 +0800
Subject: [PATCH 3/4] EXT-1640 Application Icon Misaligned on OSX Installer
 Dialog

---
 .../installers/darwin/firstlook-dmg/_DS_Store | Bin 12292 -> 12292 bytes
 .../darwin/publicnightly-dmg/_DS_Store        | Bin 12292 -> 12292 bytes
 .../installers/darwin/release-dmg/_DS_Store   | Bin 12292 -> 12292 bytes
 .../darwin/releasecandidate-dmg/_DS_Store     | Bin 12292 -> 12292 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/indra/newview/installers/darwin/firstlook-dmg/_DS_Store b/indra/newview/installers/darwin/firstlook-dmg/_DS_Store
index 408a4d49925b8f6c31a1050e2f4e6c27bee6b0f0..9d9fd897e7d9cc604462c1732454d823b8573b21 100644
GIT binary patch
delta 409
zcmZokXi1ph&&azmU^hP_?_?eU<NBoX;)0}{{3HejhV@AWIhn;J1_sv{nV4Bv+1NQa
zxHx!X!ZY(y^2?p_OY>5Sqk}W@%Y!phQj-#kV!`Z^#FEltr^F(#Oh95u22cjf4$05Y
z0kUJDs>3r=N;2XFB&w^84UKgaj7%(Rbrh=2>P;+k6ik7fT24+5PJs>%Q6)VakC4Qg
z+PeA%pqqezkr6^O@Iq-A)dZ4c&`T@NG=Ta*fME*5dB*)rhclD&%Am@?DvHZ<^7GPx
zA`@VG$});G@{1TY*9b_kOx`1+%L0;^{8q$SUYNm$A(J7GA%!6oNV)*YG9b=j$Y&@3
k(nXUC#biK=nKn<9`_H(UUE&+dWE+tPvdt(KoY>F_06sQos{jB1

delta 725
zcmZokXi1ph&nUPtU^hRb;A9>FW4*NUOoODH{3Hej1_6c?h7`trrijesyfPpk1Q;2B
zDvHZ<^7GPxyu+LI1l3s-Sr|+hEEx<Lj6HMmli`{f7@`;$m<s*_!DK&C6BaO|P1JdE
zuc$<Q2}3$VBC2vmKA?$yAXWeWgREj;XGmkn2SPmtEUFQPLshFV_%LKL<N@8B3M3U6
zf*Fz-ihv>oK;0nmbfB0ILn4?}S`TET0~IPTxHFUjr9qnX7&3rLa~X2boHY^X>laAQ
z5@ZMhs?Gu8M22Fp8Gb-VmH=7BV5e3vl%SdbbOHn8L?jcW7$%<;k`Q(ST3iIwR04Jx
n$fwzpUx>=EK~!!mEMeTtF7b_J@-$K7(J&(_%r*<k6$%0X+rY;i

diff --git a/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store b/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store
index b901e46b659ad995165b97bceebb1bcb1c465e06..9d9fd897e7d9cc604462c1732454d823b8573b21 100644
GIT binary patch
delta 412
zcmZokXi1ph&&azmU^hP_?_?eU<NBoX;)0}{{3HejhV@AWIhn;J1_sv{nV4Bv+1NQa
zxHx!X!ZY(y^2?p_OY>5Sqk}W@%Y!phQj-#kV!`Z^#FEltr^F(#Oh95u22cjf4$05Y
z0kUJDs>3r=N;2XFB&w^84UKgaj7%(Rbrh=2>P;+k6ik7fT24+5PJs>%Q6)VakC4Qg
z+PeA%pqqezkr6^O@Iq-A)dZ4c&`T@NG=Ta*fME*5dB*)rhclD&%Am@?DvHZ<^7GPx
zA`@VG$});G@{1TY*9b_kOx`1+%L0;^{8q$SUYNm$A(J7GA%!6oNV)*YG9b=j$Y&@3
p(nXUi#bnrkikbfZ-&pvUaWlKbH<rmZA`#>ovU#Cgvf#vq=>YsQY=-~<

delta 741
zcmeHDu}Z^G6g{s5yNEVIAfS{8f?H71#o0lG5{oY4)Fibr@Jy;ntxjD^H_;OCKT1YN
zXaA#L;2KY&Xe%!6-p70I-uuoy_q;o5kJ^t%LY=mrSB07`*DSL;2zFc<xd3YDpd%hC
zr-2vVFfL4hh<G5Q&}a0Lnd-K(si1*9?7}*fk@r;$oB@?yPD^dAp_I;8+fVN`eVD+9
zvj`U}WV8!Zo)@i9MHdm5iC@s)<e%s*G!Y=A=5w9~PT=91nI5Z)yw6+{PU-cBbbJC0
z9H7tVqR7Mrp_h<9WKH<%*_<pD$3#nR2XV<^Q)EIfE~VZgS!AFDh{+s79qH?uzTRSM
qmqY=T8nAi$r38t)bf#@AeN;@Zq{yoJo02|h*8lAOG`mc#2kJXyCdy|3

diff --git a/indra/newview/installers/darwin/release-dmg/_DS_Store b/indra/newview/installers/darwin/release-dmg/_DS_Store
index 2c179b11a485aa48ea350abd57bd072c8bd2e31b..9d9fd897e7d9cc604462c1732454d823b8573b21 100644
GIT binary patch
delta 345
zcmZokXi1ph&&azmU^hP_?_?eU<NBoX;)0}{{3HejhV@AWIhn;J1_sv{nV4Bv+1NQa
zxHx!X!ZY(y^2?p_OY>5Sqk}W@%Y!phQj-#kV!`Z^#FEltr^F(#Oh95u22cjf4$05Y
z0kUJDs>3r=N;2XFB&w^84UKgaj7%(Rbrh=2Y)mY46ik7fT24+5PJs>%Q6)VakC4Qg
z+PeA%pqqezkr6^O@Iq-A)wJ1CAev?J9uZv@kg~~dMV#e@8GINr8S)rX7*c_x3y>@W
w;v9y2h5{g6G&x#Kh7G8g>Hq(Yg?|}0vrBwqnQS8xL9QX28|9h>CpMG=09gB6AOHXW

delta 673
zcmZokXi1ph&nUPtU^hRb;A9>F<4uC0EQ%})CJdGgh787@Ir+&+Ir&Kp3=9H59L2!E
zRPY}NCi{t+uz(qDqRx|hMJ4J>7}6OMQI#|D0k!ynRQ>-CWHB(XGo&%(1EC%R7S#yD
zp{i9Fd>Aqr@)%MWQh}rbLoh=!LlID<0H_-zo(>fAVMqkCO6!4)bf7{726u*1pfpI6
z9zzCDX)Z$!nzJS{FfhJAa+V-N5Kwgv5GOJegU#>*I<f@FDh4~Xf}sS}1fUZb7$+i`
zz|SBW3{;*B)CO`d$X%I0zot%pAu7WLQMa+Mi*Yl%#5b17(?pF&LyU+J+bk&8E(icF
CPq~5s

diff --git a/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
index 309c8adaaa6586d75fb3ba5d8dbd6aaaff813b12..9d9fd897e7d9cc604462c1732454d823b8573b21 100644
GIT binary patch
delta 410
zcmZokXi1ph&&azmU^hP_?_?eU<NBoX;)0}{{3HejhV@AWIhn;J1_sv{nV4Bv+1NQa
zxHx!X!ZY(y^2?p_OY>5Sqk}W@%Y!phQj-#kV!`Z^#FEltr^F(#Oh95u22cjf4$05Y
z0kUJDs>3r=N;2XFB&w^84UKgaj7%(Rbrh=2>P;+k6ik7fT24+5PJs>%Q6)VakC4Qg
z+PeA%pqqezkr6^O@Iq-A)dZ4c&`T@NG=Ta*fME*5dB*)rhclD&%Am@?DvHZ<^7GPx
zA`@VG$});G@{1TY*9b_kOx`1+%L0;^{8q$SUYNm$A(J7GA%!6oNV)*YG9b=j$Y&@3
s(nXW&#bnrkikbfZ-&pvUaWlKbH<rmZA`v7T0<w{5^L)8f!HEsi0UeNPlK=n!

delta 753
zcmeHDF-yZh6#lLRyNLFLgA5`K2yQ`17v~NllqkB0Q`5x6KuoGhty`DkCRz^sA0?xs
zv;U*Nz%{-*Mcd-!>^tsw@7?!(_uU(J$K9tR#;3<G>x|3QhGU1rc(<2iJpc^^2-suo
zEcVk|s#P!$A|EDM8d3FH+I+{b479M1JvfI+=6{ocbD-9*D5NV|hEDE9TRsSLR3L)4
z2xn`g=qglIsi#m!h>VtvU(i3|U+8Ug5F;he7j!mp3LiJr=@VP^BkFbF>1;5fBqCrF
z2N=+`BH6ek=oOMBTNC>AY|a+P3853(9&)YWlF5RyTwA?Ev8X^6z$SAF7UbK8X)VjN
kwYxyu@syyPiOrQy-t;<TW!-!?<g;-8C-{d6mVC?SAKOmMZ2$lO


From 6dcdcb191111a4ac2ea423d1d3e21673bb930b1d Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Fri, 4 Dec 2009 13:22:17 +0800
Subject: [PATCH 4/4]  Deleting content inside a prim from build floater
 deletes prim, rather than content EXT-2575

---
 indra/newview/llpanelobjectinventory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 7b0eb8c2d2..79e84efd5f 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1695,8 +1695,8 @@ void LLPanelObjectInventory::updateInventory()
 	}
 
 	mFolders->requestArrange();
-	//LLEditMenuHandler::gEditMenuHandler = mFolders;
 	mInventoryNeedsUpdate = FALSE;
+	LLEditMenuHandler::gEditMenuHandler = mFolders;
 }
 
 // *FIX: This is currently a very expensive operation, because we have