4a7c31ee1d
avp->avp merge
...
--HG--
branch : avatar-pipeline
2009-12-09 15:50:40 -05:00
f7215a5d7c
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-09 14:53:12 -05:00
96d5f52624
EXT-3274 : Landmarks or Favorites accordion panel shows up as empty
...
EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab
Forcing top-level folders open when accordion is active. Removed logic that was saving and restoring initial folder state.
--HG--
branch : avatar-pipeline
2009-12-09 14:47:52 -05:00
019fc57855
fix for linux build breakage, a LLPointer was being implicitly cast wrong
...
approved by Seraph
--HG--
branch : avatar-pipeline
2009-12-09 11:34:44 -05:00
e6f1604549
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-12-09 11:16:43 -05:00
d75e1472c4
EXT-2819 crash in color picker in appearance editor
...
Made progress by writing code to match the style we use for the texture picker.
It now should not make a difference if you destroy the color picker floater or
the color swatch control first - either direction it should do sufficient cleanup
and protection. However, still getting this crash. Will investigate further later.
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
2009-12-09 11:16:25 -05:00
2c0cea9017
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-09 10:22:40 -05:00
adc975ff91
Reduce likelihood of indefinite wait in viewer integration tests.
...
Introduce LLStartupListener to allow viewerclient-based test script to query
startup state. This handles the scenario in which, by the time the test script
manages to connect, the viewer already IS in STATE_STARTED.
Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make
that wait time out eventually to deal with "System currently logging you off,
please wait 5 minutes." Timeout raises new ViewerWontLogin exception.
Fix testlangs to catch ViewerWontLogin and retry a limited number of times.
2009-12-09 10:20:08 -05:00
cb88b7f4a4
merge
...
--HG--
branch : avatar-pipeline
2009-12-08 22:15:17 -05:00
b93fb9f319
Merge
2009-12-08 17:16:34 -08:00
423b943b41
Merge
2009-12-08 16:59:58 -08:00
be49b8bed5
EXT-3158 - Removing logging of users password hash from new login code.
...
Reviewed by Brad
2009-12-08 16:57:45 -08:00
8b514c721a
Merge backout
2009-12-08 16:29:02 -08:00
a65473957f
Back out EXT-2827 Unable to delete object when select face of object
...
May cause right-click delete to fail - testing that
Backed out changeset: 1f8e1e73f9f4
2009-12-08 16:28:34 -08:00
85272b3d69
Merge with Lis and Leyla' stuff
2009-12-08 16:14:24 -08:00
ae493ad72f
EXT-3118 disabled Alerts appear to be enabled in Preferences
...
Wasn't rebuilding the list of alerts on Preferences open
Cleaned up some formatting in llfloaterpreference.cpp
2009-12-08 16:13:48 -08:00
0bfee2e4e0
EXT-2980 Made location history menu items XML-configurable
...
Reviewed with Leyla
2009-12-08 15:20:41 -08:00
9472608807
EXT-3256 : Show help message in Favorites bar if empty
...
--HG--
branch : avatar-pipeline
2009-12-08 18:19:39 -05:00
2fb6e2629b
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-08 18:12:05 -05:00
07e15bedd9
EXT-3192 Preferences > Sounds UI issues
2009-12-08 18:11:59 -05:00
c130f5d4c9
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-08 17:40:20 -05:00
8d261e9b2c
merge
2009-12-08 14:35:45 -08:00
08233e283d
added fading back to icons in text widgets
2009-12-08 14:34:44 -08:00
d4b888d478
EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory accordion
...
Put in a quick fix so that folders can't be made reparented to their own children.
--HG--
branch : avatar-pipeline
2009-12-08 17:31:02 -05:00
f7c883be9a
EXT-3266 : Object contents show up as empty always
...
InventoryFilter was rejecting all items that didn't exist in agent inventory. Changed this to properly account for inventory of in-world objects.
--HG--
branch : avatar-pipeline
2009-12-08 17:25:31 -05:00
1f694f5395
L10N: add a helpful tooltip to the refresh icon, as done in other places in the UI
2009-12-08 14:21:23 -08:00
bfdfec637c
INFRASTRUCTURE: Took out unused function "getAllAttachmentsArray" from llvoavatarself.
...
--HG--
branch : avatar-pipeline
2009-12-08 17:18:43 -05:00
238d1de6b5
L10N: clarify wording in panel_group_notice accordian. Please, no more Ascii art arrows in 2.0.
2009-12-08 14:16:25 -08:00
365c4fa596
L10N: Add much-needed linguistic context in the comments of strings.xml
2009-12-08 14:15:12 -08:00
7dfaba5760
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-08 17:13:34 -05:00
44d576e870
Re-adding references to Arrow_Up and Arrow_Down so these arrows show on panel_preferences_alerts.xml
2009-12-08 17:13:27 -05:00
764123a031
Capitalized the tab labels.
...
Bonus: made them conform visually to other tabs in the side panel
http://jira.secondlife.com/browse/EXT-3073
2009-12-08 17:09:14 -05:00
9aa12417cb
ext-3087 - avatar icon is truncated badly
...
reviewed by James
2009-12-08 14:08:58 -08:00
5b9955a2d3
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-08 16:43:19 -05:00
962f29db45
Changed "Assigned Roles" to "Assigned Members".
...
http://jira.secondlife.com/browse/EXT-3079
2009-12-08 16:41:52 -05:00
4b2e892c59
Merge bringing in new vivox sdk
2009-12-08 13:11:42 -08:00
64fd7cdb27
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-08 15:55:27 -05:00
7b85febf27
EXT-2599 Temporary Text in filter fields should be a lighter color than User typed text
2009-12-08 15:55:18 -05:00
2983a07f56
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-08 15:32:50 -05:00
3e28fa26da
World > Snapshot is supposed to have separators, per the Design Spec - Top Menu
...
L10N: use the consistent term 'Side Tray' already used elsewhere in the UI. Even if this isnt visible, it becomes part of our glossary and translation.
2009-12-08 12:31:15 -08:00
0dd425aaf1
Added space between Server message output area and expand button to prevent overlapping elements.
...
http://jira.secondlife.com/browse/EXT-3116
2009-12-08 15:30:53 -05:00
27da9502d4
Update vivox sdk to 3.0.0006.7714
2009-12-08 12:29:44 -08:00
2985fbe96b
L10N: use consistent terminology in tooltip for a button that does the same thing as the one in the Navigation Bar
2009-12-08 12:29:33 -08:00
e9fcaa09e0
For EXT-3166 : MyInventory/Library Places accordions are causing massive inventory background fetch on startup
...
Took out line to start background fetch at start of filter; the background fetch will start when the filter is started. This prevents the viewer from requesting a complete inventory fetch at login.
--HG--
branch : avatar-pipeline
2009-12-08 15:06:39 -05:00
00b9219367
merge
2009-12-08 11:54:19 -08:00
a4f53bf153
merge
2009-12-08 11:53:00 -08:00
2a21950a46
L10N: the terminology 'Show Profile' is not to spec. Make this consistent to 'View Profile' used everywhere else.
2009-12-08 11:49:40 -08:00
fa4d3e1867
Merge
2009-12-08 11:43:38 -08:00
25a773d79c
DEV-43896 solve render-pipeline linux mesh gzopen64 problem
...
I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.
2009-12-08 11:39:44 -08:00
0a57b11741
merge
2009-12-08 11:31:10 -08:00
Loren Shih