2fa8c6f3da
Merge
2009-12-09 18:27:38 -08:00
4cca7eb425
EXT-299 "Mute" still showing in menu_pie_avatar.xml although label says "Block"
2009-12-09 18:26:34 -08:00
6fae49dc2a
Merge
2009-12-09 17:42:44 -08:00
6408298aad
EXT-3112 - Bad font width information with SansSerif causing clipping of trailing "r"?
...
better handling of ui scale != 1
reviewed by Mani
2009-12-09 17:41:42 -08:00
23610472d5
lazy evaluation of lluistring to improve LLUIString::format performance
...
reviewed by Mani
2009-12-09 17:17:07 -08:00
42120752bd
Cleanup unneeded topleft attributes, document similar menu files
2009-12-09 16:58:49 -08:00
dab87201cd
Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu
...
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus. Created separate other-attachment menus.
Reviewed with Richard.
2009-12-09 16:37:08 -08:00
418f30d1cd
Merge
2009-12-09 14:58:49 -08:00
9abe779c8a
last blind fixup for llmediaplugintest.
2009-12-09 14:55:45 -08:00
43b71ced90
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-09 17:51:44 -05:00
201e8419ee
ext-3297 Input/Output Devices are cut off in Preferences
2009-12-09 17:51:33 -05:00
9b0825be5c
get llmediaplugintest compiling on win32, dumbly.
2009-12-09 14:48:36 -08:00
ca2566a1ac
Merge
2009-12-09 14:36:52 -08:00
05e0d9d24a
Re-disable a very spewy debug spew in the webkit plugin. Mea culpa.
2009-12-09 14:36:45 -08:00
6dd56fddd7
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-09 14:34:45 -08:00
2a1e3b48f9
Crash fix due to bad duplicated attributes in xui
2009-12-09 14:34:26 -08:00
204ae550d8
blindly fix-up llmediaplugintest.cpp with respect to the recent API change.
2009-12-09 13:59:51 -08:00
2554a88ec1
merge!
2009-12-09 13:46:05 -08:00
7466aa198a
Merge
2009-12-09 13:42:07 -08:00
1c0b5d4435
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-09 16:35:15 -05:00
3b36b1fd2a
ext-2976 change "alerts" to read "notifications"
2009-12-09 16:35:05 -05:00
6260ce6a92
Merge
2009-12-09 13:24:21 -08:00
2af183c51d
remove LL_PATH_BROWSER_PROFILE
...
it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer.
2009-12-09 13:20:25 -08:00
7193e97b98
Fix line endings.
2009-12-09 13:14:04 -08:00
627bdb5bd4
Merge
2009-12-09 13:11:20 -08:00
0c1d9da1c1
merge
2010-12-08 11:58:16 -08:00
52dd4daada
adding notes about visible / enable callback registries being merged
2010-12-08 11:56:44 -08:00
f4fd622686
EXT-2807 Update mini-inspector to include Group Voice Chat moderator controls
...
reviewed by Richard
2010-12-08 11:51:43 -08:00
3b355848af
merge
2010-12-07 13:41:38 -08:00
27d6f0e49c
EXT-3265 Gear menu on_visible params are broken - not setting visibility of menu items
...
EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2010-12-07 13:39:56 -08:00
3476116de8
EXT-2827 and fix for delete key not deleting objects while building.
...
Object inventory was grabbing edit menu handling during refresh.
Put back Angela's code so that Right-click > Remove > Delete
is now disabled if you have a single face selected. Fixed
LLSelectMgr::contains() for SELECT_ALL_TES case.
Reviewed with Richard.
2009-12-09 13:06:07 -08:00
e9bca5d52a
EXT-2980 Remove indentation on back button history list.
...
Design reviewed with Lis
2009-12-09 13:02:51 -08:00
197de032e1
DEV-43948 viewer2 is writing session data into the 'read-only' installation tree (mostly media stuff)
...
propagate the parent app's OSUserAppDir (i.e. ~/.secondlife/) all the way down to plugins, if they need persistant user data/settings (like the webkit plugin needs a place to put its cache).
2009-12-09 12:57:10 -08:00
883ef71722
automated merge
2009-12-09 15:42:07 -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
15fbfa5ae1
rename LL_PATH_MOZILLA_PROFILE to LL_PATH_BROWSER_PROFILE
2009-12-09 10:31:50 -08:00
5216304b2c
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-09 10:07:07 -08:00
a301e6dd5b
merge - bad line endings
2009-12-09 10:06:06 -08:00
89c0fc48b2
ext-2981 button and text editor height schould be 23px, not 16px
2009-12-09 12:07:16 -05:00
a4dc0881aa
Merge
2009-12-09 08:44:44 -08: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
cefa8e4f54
EXT-2980 make back button in nav bar match spec
2009-12-09 11:28:56 -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
ffca4ec568
Accordions in appearance panel don't use full space, removed borders in inventory panel, standardized button sizes, changed login according to feedback
2009-12-09 06:06:37 -08:00
cb88b7f4a4
merge
...
--HG--
branch : avatar-pipeline
2009-12-08 22:15:17 -05:00
be45239d00
merge
2009-12-08 18:43:57 -08:00
James Cook