From 7decac40e6453b2d8822d2677b9b59300bc260cf Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Thu, 23 May 2013 09:39:49 -0400
Subject: [PATCH] Override NSPanel's close method to hide the window instead of
 actually removing the window.

---
 indra/llwindow/llopenglview-objc.h  |   4 ++++
 indra/llwindow/llopenglview-objc.mm |  25 ++++++++++++++++++++++++-
 indra/newview/SecondLife.nib        | Bin 13009 -> 13021 bytes
 indra/newview/SecondLife.xib        |  14 +++++++-------
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/indra/llwindow/llopenglview-objc.h b/indra/llwindow/llopenglview-objc.h
index e20ea533fb..5309dea664 100644
--- a/indra/llwindow/llopenglview-objc.h
+++ b/indra/llwindow/llopenglview-objc.h
@@ -47,6 +47,10 @@
 
 @end
 
+@interface LLUserInputWindow : NSPanel
+
+@end
+
 @interface LLNonInlineTextView : NSTextView
 {
 	LLOpenGLView *glview;
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 8ef6d4e682..17e8c3e3cc 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -527,6 +527,15 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 @end
 
+@implementation LLUserInputWindow
+
+- (void) close
+{
+    [self orderOut:self];
+}
+
+@end
+
 @implementation LLNonInlineTextView
 
 - (void) setGLView:(LLOpenGLView *)view
@@ -536,16 +545,30 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void) insertText:(id)insertString
 {
+	[[self inputContext] discardMarkedText];
+    [self setString:@""];
+    [_window orderOut:_window];
 	[self insertText:insertString replacementRange:NSMakeRange(0, 0)];
 }
 
 - (void) insertText:(id)aString replacementRange:(NSRange)replacementRange
 {
 	[glview insertText:aString replacementRange:replacementRange];
+}
+
+- (void) insertNewline:(id)sender
+{
 	[[self textStorage] setValue:@""];
 	[[self inputContext] discardMarkedText];
     [self setString:@""];
-    [_window orderOut:_window];
+}
+
+- (void)doCommandBySelector:(SEL)aSelector
+{
+	if (aSelector == @selector(insertNewline:))
+	{
+		[self insertNewline:self];
+	}
 }
 
 @end
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
index cb289ebf097adfcaca74c7524dc5663cc72c50ad..a5f27171677e459d9cb8a3c068ccee095e878954 100644
GIT binary patch
delta 1385
zcmWN{dvuOv003~8Hb!;yKF{+$&->io=ko3QJ~eD}P1YR=iO#GNqgk4@&CHB&zElz-
z`qU}3mV*{%o6of|bEl;pmy+YU$ZfHd(~*k${rx+feLB0UG_F-@a<nY2xmCC1*rNC&
z?O|qz2L=sFFUp=cAb&#fq>P;Wu>~cuTqiH?{}EjjpBTG~mx4%%v)CzjRy%8*bxxJD
z-r3-6cj}y7&K}SjJOF|q6{LglU@~|g%mp8UMIZ`32Bn}3EC(yVO0W)8f%TvU>;d)Q
z5NH60!BKDuoCS^GJopQ?fcHTJG4vpV26lyy!~Sppd=5SjhrtnW6dVm-jlf(u0ZxRI
z;AA)j&VuvdXK*R}9Dacu#E?col!UsY-l#tsgq}kgC=-oEd1wlniB_R<v>L5J6{r$b
zqZrzTj-qqu3c88zx(RN;?c?@!hq)u%Y&YL6ai_Y|+!=1fo#~dkF}K$J);;bvxp#1+
z1#XGk;d}A@7~>?Ig8ShtoQ+?@1-K9w;f44k9L39UDK5j?@eW*v58`@!2shx%q&>kT
zOdcdjq%%n-J;~FgA9;p6OU99WGM&6f7Lm`$DpF2XlS)!eVq_!POb(D^<Rm#w&XPuQ
zp4=jTMZ9<qdD!zj=2@@1_oz428}4O!+1@xW$D8iW@)mj@dtZ4~-T|+{JL5HZ*Su!$
z26bqVhG{3-g{IK1v^(udAE!^!7ikX7rFpb~7SaWDA^nIhrk~JH=@PnzR?tdXO=EOF
zy+m))Kj|%cn=uv<%x9WemdHXZjXlQtvf=DS_A+~gjbaftlfA=cvDs`6o5xC78T*>8
zVHK=~?PEvT59~NQ!EUpEcuU@z$MH5ifw$+FC-XG^7=MC4#Ygj3`B?rMf1Qu#Z}4Ki
zfG_2r^Dp?9yq4GTU3?GU7vTr^x4eO$;#YVRzs8$I2jK`PTtNgCTyzu<iB6)6=q7rI
zK4O3vC<comVuF|`CW*;nig;5@7jKET#cZ)yd?G#-OGJ&>E_R5WVz<~U_KWYt_u`mn
z6z9b+;*xAD+sS+7{j!5}B$QNgnPz3OOqJba51Aofk|X3unJLG}ESWDS$Z7I@Iahul
z7syIkEjP(6@*BBL*2+40O#UdZ%0Hr~JEuoh`Q`p<f33gHukv^LyZycXe*d6<)Ia6_
z;$QNw_)Y#bzga;gl~P6pR8WQ0gDOdNR%xoA8mThX7?q{6)i{--a#fxxP=%^U6{{tx
zTy0dF)mBxbwy9dRL+w<%)dh7?T~=4suj;z`O(*E~5uL14bvNBZ_tX#T-nx%|RA=dI
zJx=H7T%D&2bfGTN)Ac;POqc31y<D%*6?&bn(z|rMKBAB7fAk&G!n882O`M50ZB0AV
z#iW?7rn~83dYOmKBPPu}YYI%EDKf>T#7s5Q%nTDT@0zGtW+H1$g{d^vCT2F8&1S2q
zF{jKKbI$y1E|`nvvbkoOEwrvBmRe?ol~!3}``ZC_pdD<7*rE0Xn{G4gD4S;|+nM$q
zJIl_tbL>1j->$bC>?XU#ZnZUbo2|8Vw!!{tuiM}3@Ajts)84ZG-V;a&IMG;g`h9x?
z`vV69^?^fyhQLozlrqgbo_HehWa8<>vx$v~SAzw?!eCLbI9L*#8eN%E*v5u}p^l-X
ts7RgRUk){eu7_@fZioI3{Tq%Cw+SbNov;oE!@a_3;epZWRKMlm{{VMquWkSU

delta 1373
zcmWN_X>d(f003Z&q#+3J+;i`_XS-*48$lDawG>5ZEwx2Nq-eww5fQ2>8oW~b*pinT
zB}GKU+C&ojR?W20YNxT)8hcw~?4`yM+VAIA6F3nlT^m*}rbB3b*!_C3?aOn*Pew*0
z^p6{uJTWk#e5xxW?EekrgnP;((Ham;cP(_~yVknayEeEsx;D8syLP%NT)SO+T~9$6
zz`zT7gOOl7m;q*iufRO804xHzAP=krtH3v41K0>QffBG6905l`CHN6kfogCHoB?OS
zUGUhbYcwz-jmAclVH!T8ozcnYY;-r?H+mTZjKRhbV`$JAWsEV#8sm)d#sp)!G22*b
zEH`qD5DbS=5JC(EYz|w)PVhb09rlHBa2QO66JQox4fEkzxDFP;LRbWgVJWPFr(q4e
z1^<DyCNg8p4rVWNfSG8HHq*@vGt-=GPBF90T(j6LGY^}`%`4_3Gx*qiV!pEKSoN$(
zOIRMOqm^JKTEndrD`2HsbFKN-0&9hpYvoxxt#YfvI%FNOj#`!0CF?bcL=<r(kV0-0
zjoPD*=v~wWC85!168ZwoLrc+Wl#kY;LR5r`(H67~9Yn{_@8|?Nh0dU}=nlFYM9=L8
zcBI|dj<PMgx!uO@Y4@=c>_j`s9$`<ir`vPwMfMtdqkYh>v`^Ys>}&Q7`%fH>F{W5z
zjXl_ho8xHQ4!@22;SqQgPR1!Xfal=3cs^c;7vm*(8D57Aa3L<j#rOceh;QNB_zu2D
zqDZhA0R$3@*o2T+(w1}}eMmpjp9~~}$rO@BrjqF-o6ICZl1uW)w`3hDASGl!sUkm<
z<K#DTk31kx$W!u+ydbsYHI1Zh8cW;Kx9B@`2pvj?(c$!CI+A`u)94(!oaWFF{hF51
z3c8!_rTc^QAU#YgX*I2(SLii*gVkr@EP^#;jaU=blriQo$u#q`7A%H!W?fk~)`N{<
zW7#-1o=spA*(CNE`<!L7g={ff!j`cTwv&~!U2G5A#}2UX*$?a(JHyVh^Xwvf$zJg~
zydJO5!+8X6!khBm7I$+m_wyFKFaL-S;DdM^kLL+|G#|q=`3ydbf63?YLSDqT^6mUP
zUdqdO1wY1r;g|W}PA}&}r;pRm>F*2-)wGTe?sE1x`<w&LA*afzcFsE&of_wgbIrLS
zB7{pA!W2kgK?N5=C=n|<ia{by#ES%xD3ZhoF-jzh6cG@qB26q4`C^OMCU%GtQ7Xzr
zx!5K4h;!nCxFjx%tKz!2DQd-Q>6TvUmn~$pY!#HPWsGbi6J(-Hk|X3OnJiOeK&Hw`
zGALKbT$v|V%2l#JZjc-0Zh1uhB#+An@{xQj|CLYWGx=P;l&_Rl9_3TbRSVTpwNh`Y
zSk*<PsDMgUX)0Z1s7y6kO;OX-0<}V|Qw6F}6{%viMFqF19jZiCtCQ-q`a_*l7t|$n
zP2JEDx}k2Qo9HOrOuMw9P2EX%)?IZs-9z`(AL!n?uO6(E^?047r|RiCThG)%JzH<m
zoAp+`UGLB(x>T3x3SFtM>g)QZ{!8D|xAh(UP}jP{-2r#1JI$S5-<{#k43)>kH~!T#
z$P?#@_at}{JxL)Ln+-2}Q@jChsyEG>?#=LKdO!7Md8dW8#7=%g`8+<qFFGXK%(U+L
f?)x74p8H<-YW?AU=*Rw+{#bw4(4jU?-ERK@wY8v(

diff --git a/indra/newview/SecondLife.xib b/indra/newview/SecondLife.xib
index c6b72485a1..e5736f76a4 100644
--- a/indra/newview/SecondLife.xib
+++ b/indra/newview/SecondLife.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12E30</string>
+		<string key="IBDocument.SystemVersion">12E52</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
@@ -335,7 +335,7 @@
 					<string key="NSFrameSize">{1024, 600}</string>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1440}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">Second Life</string>
 				<int key="NSWindowCollectionBehavior">128</int>
@@ -347,7 +347,7 @@
 				<string key="NSWindowRect">{{272, 176}, {938, 42}}</string>
 				<int key="NSWTFlags">-1535638528</int>
 				<string key="NSWindowTitle">Input Window</string>
-				<string key="NSWindowClass">NSPanel</string>
+				<string key="NSWindowClass">LLUserInputWindow</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="1044753903">
@@ -533,7 +533,7 @@
 					<reference key="NSNextKeyView" ref="238626476"/>
 					<string key="NSReuseIdentifierKey">_NS:21</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1440}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
@@ -1180,11 +1180,11 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
+					<string key="className">LLUserInputWindow</string>
+					<string key="superclassName">NSPanel</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+						<string key="minorKey">./Classes/LLUserInputWindow.h</string>
 					</object>
 				</object>
 			</array>