7d6cae3a5e
merge
2010-02-18 18:46:37 -08:00
6b73675897
EXT-5545 - make volume popup and nearby media popup mutually exclusive
...
reviewed by Leyla
2010-02-18 18:45:27 -08:00
e9056ef59d
Merge
2010-02-18 18:39:56 -08:00
363f4e877c
EXT-5440 Deleting Script in Object contents deletes object when using delete key on keyboard
...
reviewed by Richard
2010-02-18 18:36:13 -08:00
53d0929bf4
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-18 21:33:12 -05:00
6704b1ea7f
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
2010-02-18 21:32:53 -05:00
e0249da7fd
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 21:28:10 -05:00
bb31822ca9
Finished (for now) side-panel cleanup.
...
http://jira.secondlife.com/browse/EXT-4335
2010-02-18 21:27:42 -05:00
63e2d18440
automerge
2010-02-18 21:00:10 -05:00
1df3ef8766
Backed out changeset 49e628c3a0c5 - further changes for reverting default/base changes.
2010-02-18 20:59:47 -05:00
c0ae5bb99b
Missed the CMake file in backing out changes
2010-02-18 20:48:41 -05:00
9dbe107f4e
move base back to default because doing it as a backout was causing merge errors
2010-02-18 20:37:37 -05:00
6b48a59c99
merge changes from backing out the directory change of default to base
2010-02-18 20:36:47 -05:00
2d00beeed2
Backed out cpp changes from changeset 49e628c3a0c5
2010-02-18 20:36:03 -05:00
c4b42ca78f
Reverting change 570851c5baa5
...
because it's broken
2010-02-18 19:54:34 -05:00
e0efa1dfa2
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 15:48:56 -08:00
ef9b7c5b36
Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby chat window opens the link".
...
Added an optional bool parameter "hit_past_end_of_line" to LLTextBase:: getDocIndexFromLocalCoord() and getSegmentAtLocalPos(). Default is true, which gives the old behavior. If false, clicks past the end-of-line won't map to the last segment on the line.
Made LLNormalTextSegment::handleHover(), handleRightMouseDown(), handleMouseDown(), and handleMouseUp() call getSegmentAtLocalPos() in this new mode before processing URL actions, and only do the processing if it returns the same segment.
Reviewed by Richard.
2010-02-18 15:45:31 -08:00
890ec637d4
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 15:22:10 -08:00
1d1e4c7abe
merge
2010-02-18 14:09:55 -08:00
7ed47f7225
fixed line endings
2010-02-18 13:58:57 -08:00
08e3e05c0a
Additional optimizations to text reflow for EXT-5071.
...
Added versions of LLFontFreeType::getXAdvance() and LLFontFreeType::getXKerning() that take LLFontGlyphInfo* instead of llwchar. This allows code in LLFontGL that already has the LLFontGlyphInfo* to pass them instead, saving calls to LLFontFreetype::getGlyphInfo.
Reviewed by Richard.
2010-02-18 13:40:32 -08:00
9c2559924c
merge
2010-02-18 13:32:15 -08:00
284eb11a10
Work in progress on EXT-5333: Bodyparts missing from appearance and COF
2010-02-18 16:10:35 -05:00
3af609b55c
fixed some spacing munged by merge
2010-02-18 12:57:05 -08:00
876a764c4f
EXT-5535 - Resize handles will move floater when reaching minimum size
2010-02-18 12:49:31 -08:00
d742b3e911
Merge with tip
2010-02-18 11:22:17 -08:00
77009a366f
EXT-5363 webkit does not strip spaces off a typed-in URL
...
Reviewed by CB
2010-02-18 11:21:36 -08:00
4ab945c9f0
Merge - updating from hotfix
2010-02-18 10:59:09 -08:00
2231da11dd
EXT-4677 Crash when closing pinned menu which has no parent Inventory floater
...
Reviewed by Richard CC#118
2010-02-18 10:52:34 -08:00
4175268172
Merge
2010-02-18 10:32:52 -08:00
4514b57126
Backed out changeset: 744bd7c535fa
2010-02-18 10:29:56 -08:00
c4a3bee335
fixed major EXT-5493 “llInstantMessage sends message to "nearby chat" window,
...
but not to toasts in viewer”,
made llInstantMessage logged into nearby chat window and nearby chat toast;
--HG--
branch : product-engine
2010-02-18 20:21:02 +02:00
7f432e0858
EXT-5532 Remove any UI evidence of select-buffer rendering's existence
...
This removes the snapshot 'matte' option. This has been broken for a while, does not appear in spec, there is no pjira evidence that anyone noticed, and it has a LOT of squirrelly code behind it.
Remove the UI option. Later, if no-one screams, the big piles of underlying code can be removed.
2010-02-18 18:05:03 +00:00
ca6caad68c
merge
2010-02-18 09:25:04 -08:00
5e26566f48
Fixed low bug (EXT-5212) Add "Parcel Properties" and "Coordinates" to World->Show.
...
--HG--
branch : product-engine
2010-02-18 19:13:14 +02:00
9ef57a894f
Fixed class name and xml file name.
...
--HG--
branch : product-engine
2010-02-18 19:03:34 +02:00
b5f9e437ea
PE merge.
2010-02-18 16:57:52 +00:00
67af47fd86
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-18 16:48:40 +00:00
023bbc608d
DEV-44136: Don't show previous search results when opening Find floater.
...
We now tear down the web view when we close the find floater. This
means that we don't show the previous search results when performing a
new search. It also makes for more efficient use of resources as we
don't have a web view continually running in the background. (This is
how the Help Browser currently works too.)
2010-02-18 16:48:02 +00:00
8e134590e6
Fixed low bug EXT-871 ("Stop Flying" button isn't displayed after standing up)
...
- moved code to show Stop Flying button in a common place for both cases: click on "Stand" btn & call "Stand Up" menu item
--HG--
branch : product-engine
2010-02-18 18:42:31 +02:00
2cf2fa6ad2
Fixed low bug EXT-5225 - Local chat doesn't go translucent when loses focus.
...
Added customizable background image overlay color to control background transparency. Default overlay color is White, as before.
--HG--
branch : product-engine
2010-02-18 18:28:13 +02:00
a226668381
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-18 11:14:52 -05:00
1ca9c1dcfe
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
2010-02-18 11:13:54 -05:00
1933a378ea
Corrected embedded notification panel message index in session list;
...
--HG--
branch : product-engine
2010-02-18 17:51:06 +02:00
c44b25abe2
EXT-5461: Reverting change 49e628c3a0c5.
...
Renaming skins/base back to skins/default to unblock I10n.
Revert was requested by Q.
2010-02-18 15:03:03 +00:00
b71f451b76
EXT-5461: Reverting change 49e628c3a0c5.
...
Renaming skins/base back to skins/default to unblock I10n.
Revert was requested by Q.
2010-02-18 15:03:03 +00:00
eec9f20d74
fixed EXT-5006 “One inventory offer cause blinking of both Conversations and
...
Notifications wells”,
embedded inventory offer panel into IM window;
--HG--
branch : product-engine
2010-02-18 16:05:11 +02:00
fa03910a34
merge.
2010-02-18 13:54:31 +00:00
f33a1d7ad9
merge
...
--HG--
branch : product-engine
2010-02-18 15:45:48 +02:00
7f3b3d3bd6
EXT-5389 Unreadable resident names with glow.
2010-02-18 13:43:42 +00:00
Richard Nelson