92cef0426d
automated merge from trunk
2010-02-25 11:33:56 -08:00
c6163fafaa
automated merge
2010-02-25 01:34:52 -08:00
0bf246ed66
Automated merge
2010-02-25 00:17:42 -08:00
c2ca71322b
automated merge
...
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
2010-02-24 19:10:43 -08:00
a0de48f0cc
automated merge
2010-02-24 18:29:27 -08:00
a9867b6437
Automated merge
2010-02-24 18:28:19 -08:00
615afb52a7
remove DOS newlines
2010-02-24 17:15:40 -08:00
1718a41c2f
remove windows line endings
2010-02-24 17:09:15 -08:00
6bb43e1369
Automated merge up from viewer 2.0 trunk.
...
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
2010-02-24 17:04:48 -08:00
fdf8602d5f
fix for inline widgets never shrinking with resizable text editor
...
also fixed dropping last line in chat history
2009-12-07 19:03:31 -08:00
7c69928ff8
Fixups for things broken after the last merge and for the linux build.
2009-12-07 18:43:47 -08:00
6301211b7c
EXT-2855 delete 2 more entries in strings.xml that are not actually user-visible
2009-12-07 17:28:39 -08:00
5c2686bc63
Merge
2009-12-07 17:09:19 -08:00
5245fb6972
merge fixes
2009-12-07 17:07:52 -08:00
a0770d5ec0
LLSidepanelTaskInfo cosmetic cleanup.
...
--HG--
branch : avatar-pipeline
2009-12-07 19:54:49 -05:00
b65334a4c1
L10N: Add much-needed linguistic context in the comments of strings.xml;
...
L10N: consistency in phrasing on the 2 separate places in the Nav Bar where you create/edit a Landmark
Also, add a separator to menu_NavBar so its easier to parse visually.
2009-12-07 16:25:08 -08:00
f96a914310
merge
2009-12-07 16:05:59 -08:00
9395d6f610
ext-3152 - crash when opening debug console
...
bad cast
2009-12-07 15:58:05 -08:00
0b4b03fe3e
Merge from product-engine
2009-12-07 15:57:31 -08:00
2e5d22357f
EXT-3062 Inspector affordance should spawn closer to mouse
...
Reduced some size constants. Trivial, not reviewed.
2009-12-07 15:47:10 -08:00
3cf11892e4
fix for horizontal scrolling in text_editors
2009-12-07 15:34:19 -08:00
7d905e6180
merge
2009-12-07 15:16:39 -08:00
81c18d5442
EXT-3159 Mouse-wheel scrolling down causes unexpected side-scrolling
...
If vertical scroll bar is visible, give it the scroll events and
don't scroll horizontally. Eliminated extraneous folder view item
scroll handler. Reviewed with Richard.
2009-12-07 15:15:52 -08:00
ff4e86a645
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-07 17:58:23 -05:00
6cd487d33b
merge
...
--HG--
branch : avatar-pipeline
2009-12-07 17:57:40 -05:00
209a660f08
For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
...
--HG--
branch : avatar-pipeline
2009-12-07 17:56:34 -05:00
a30ad1ed00
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-07 14:39:10 -08:00
cdb7fe119e
Appearance panel layout changes for Nyx - contains bug causing accordion to not follow sidepanel bottom
2009-12-07 14:38:51 -08:00
724cbb8134
Made viewerclient.py a bit more robust against timing problems on startup.
...
It now successfully retries to connect on windows.
reviewed by nat.
2009-12-07 14:37:27 -08:00
db25c10f8b
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-07 17:34:07 -05:00
7e905ac8cc
1. Adjusted vertical placement of nearby voice chat indicator.
...
2. Added text padding on the right of the chat input field to prevent overlapping of text and nearby voice chat indicator.
https://jira.secondlife.com/browse/EXT-3177
https://jira.secondlife.com/browse/EXT-3155
2009-12-07 17:33:32 -05:00
25695cc0b5
EXT-3125 : INFRASTRUCTURE : Cleanup LLInventoryFilter to disambiguate various filter options
...
EXT-3124 : Add lookup for finding all linked items to an item
Specifying date range now is explicitly tracked as a filter type.
--HG--
branch : avatar-pipeline
2009-12-07 17:19:21 -05:00
1d60a4c678
EXT-2826 : Rename "Favorite" folder to "Favorites" folder
...
Only will affect new accounts.
--HG--
branch : avatar-pipeline
2009-12-07 17:15:49 -05:00
a162a8de97
merge
2009-12-07 13:46:30 -08:00
13c998c34a
merge
2009-12-07 13:39:12 -08:00
f22d9cfdae
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-07 16:35:37 -05:00
15fabd6b60
Tweaks to make toasts conform to style guide.
...
http://jira.secondlife.com/browse/EXT-1673
2009-12-07 16:34:34 -05:00
aa2cdcfeef
merge
2009-12-07 13:22:20 -08:00
1d2a8e0f83
ext-3112 - bad font width information with sansserif
2009-12-07 13:00:40 -08:00
9eee5fb5a4
EXT-3214 : Trash icon flahes in Recent Items when nothing in history
...
Trash icon is disabled when no items are selected.
--HG--
branch : avatar-pipeline
2009-12-07 15:49:08 -05:00
c3a82913de
Fixed normal bug EXT-3018([BSI] Hook up "Go to My Dashboard" in Profile to link to http://secondlife.com/my )
...
--HG--
branch : product-engine
2009-12-07 22:44:44 +02:00
374aa101ab
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-07 20:36:51 +00:00
24cba353a4
DEV-43439: Rename llviewerbuild.{cpp|h} -> llviewerversion.{cpp|h}
...
This module now contains general viewer version routines, not just
access to the viewer build number, so I've renamed it from
llviewerbuild to llviewerversion.
2009-12-07 20:30:29 +00:00
8e912657e8
Another merge of include dependency cleanup work with viewer-2-0.
2009-12-07 12:20:47 -08:00
de2f8212f0
DEV-43439: Added calls to query the viewer version.
...
Rather than copy/paste the same version string formatting pattern
again, I added new string-based version routines:
/// return the full viewer version as a string like "2.0.0.200030"
const std::string &llGetViewerVersion();
/// return the viewer version as a string like "2.0.0"
const std::string &llGetViewerShortVersion();
/// return the viewer build version as a string, e.g., "200130"
const std::string &llGetViewerBuildVersion();
2009-12-07 20:05:52 +00:00
4a8733fadd
No ticket. Removed inventory offer fake notification.
...
--HG--
branch : product-engine
2009-12-07 22:04:02 +02:00
98c74f4eb8
For EXT-2637: Renaming outfit that's currently worn should update Current Outfit string
...
--HG--
branch : avatar-pipeline
2009-12-07 15:02:31 -05:00
eebbf52e5e
Implemented normal sub-task EXT-3142("new message" indicator for object chiclets)
...
--HG--
branch : product-engine
2009-12-07 21:05:18 +02:00
ee159d8e74
automated merge viewer2.0->viewer2.0
2009-12-07 13:50:30 -05:00
e5eba40869
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-07 13:48:39 -05:00
Roxie Linden