Rick Pasetto
1500e90ecc
Make sure mac build honors compile-time flag that en/disables OS drag and drop.
...
Also fixed the cmake file to properly set LL_OS_DRAGDROP_ENABLED.
2010-01-08 15:11:03 -08:00
Rick Pasetto
8944bc36ed
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-08 14:12:15 -08:00
Tofu Linden
99ad123b07
Merge.
2010-01-08 13:59:15 -08:00
Tofu Linden
52ab1a03f2
EXT-4049 Change About SL window label from ABOUT Second Life to About Second Life
2010-01-08 13:58:48 -08:00
Loren Shih
d9b8307786
automated merge viewer2.0->viewer2.0
2010-01-08 16:33:43 -05:00
Monroe Linden
0a3781673f
Minor cleanup: make data members in LLViewerMediaImpl private.
...
This required adding one accessor and making two related classes friends of LLViewerMediaImpl.
2010-01-08 12:26:09 -08:00
Rick Pasetto
d33b72c318
code review feedback: fixed comment
2010-01-08 12:25:10 -08:00
Rick Pasetto
f5fd0729b6
FIX EXT-4052: don't bounce back if url does not pass whitelist
...
http://codereview.lindenlab.com/265005/show
2010-01-08 12:18:21 -08:00
James Cook
6a1a93be1a
Merge
2010-01-08 11:43:58 -08:00
James Cook
57fc68f496
Fix mini-inspector (i) icon art reference, no more gray rectangle
...
Reviewed with Richard
2010-01-08 11:42:22 -08:00
Nyx (Neal Orman)
a5a0f57120
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-08 13:15:22 -05:00
Lynx Linden
3e23a2cffc
EXT-2647: Removed the help browser's "Open in My Web Browser" button.
...
Also increased the default height of the help browser a little bit as
it looked a little too squat.
2010-01-08 18:10:24 +00:00
Nyx (Neal Orman)
cdb6f67f71
EXT-3958 title needs to update appropriately when changes made to outfit
...
We now show a string "(unsaved)" under the appearance panel outfit title
when the currently loaded outfit has been modified from its original state.
Tested with following conditions:
1) item added to loaded outfit
2) item removed from loaded outfit
3) item replaced in loaded outfit
Appears to work properly on login as well. Checking is a manual folder compare,
but should be fairly efficient.
XUI changes submitted by Erica
Entire diff reviewed by Vir
2010-01-08 13:10:15 -05:00
Loren Shih
a2d4b740ed
EXT-4089 : InventorySP File->Open doesn't open folders.
...
Includes some minor const correctness infrastructure changes.
2010-01-08 12:34:10 -05:00
richard
96898f35e8
merge
2010-01-07 19:05:40 -08:00
Erica
26d2a5fea1
EXT-4061 Right top tab - art does not scale properly, appears blurry, EXT-4042 Appearance layout tweaks, Add (unsaved) thingamajig to the end of the Outfit name for Nyx
2010-01-07 18:55:12 -08:00
richard
3a0b948bb3
merge
2010-01-07 18:38:28 -08:00
richard
c80d04cb0c
merge
2010-01-07 18:37:46 -08:00
Erica
3083ab69df
Automated merge with ssh://hg.lindenlab.com/james/gooey
2010-01-07 17:05:31 -08:00
Erica
807fafa82b
EXT-3799 Extreeeeeeeeme Navbar cleanup to match spec - favorites height, vertical and horizontal alignment, volume button art
2010-01-07 17:05:15 -08:00
richard
de746544f4
EXT-4036 - change inspector tooltip image
2010-01-07 15:53:03 -08:00
Rick Pasetto
f0c6d8c50e
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-07 15:31:02 -08:00
Rick Pasetto
31b0e51de9
DEV-44527 EXT-3650 : change the mapping of '/' on windows
...
reviewed by callum, sam, monroe
2010-01-07 15:29:49 -08:00
richard
40505adf16
merge
2010-01-07 14:57:46 -08:00
richard
9af9d0ad25
eliminated dump focus holder keyboard shortcut
...
fixed inventory sidetray layout
2010-01-07 14:57:32 -08:00
Erica
97a6f321ef
EXT-3736 Minimap dot colors need to match spec.
2010-01-07 14:36:23 -08:00
Callum Prentice
e57f6a5cee
Fix drag and drop for windows. Makes Win32 state machine behave more like Mac.
2010-01-07 14:21:57 -08:00
richard
b0effae148
EXT-3884 - group list cut off when there is room to display more
...
reviewed by Erica
2010-01-07 14:03:23 -08:00
richard
9e0e4153ca
EXT-3994 - Mouse wheel zoom on 2nd monitor unexpectedly works if pointer...
...
reviewed by Mani
2010-01-07 13:49:55 -08:00
Loren Shih
6abd41831a
automated merge viewer2.0->viewer2.0
2010-01-07 16:20:27 -05:00
Loren Shih
bb04795eeb
EXT-2203 : Wear btn doesn't disable after last Outfit deleted
...
Simple one-line fix, but fixes a core issue where if the last item in a panel is deleted, no notification is triggered.
2010-01-07 16:18:31 -05:00
Erica
18e7389ccb
EXT-4029 Add new inspector affordance to viewer
2010-01-07 12:45:10 -08:00
Brad Payne (Vir Linden)
6b8ed2ae6f
merge
2010-01-07 14:59:20 -05:00
Brad Payne (Vir Linden)
e55193cf85
For EXT-4030: Can delete the outfit folder that you're wearing in My Outfits
2010-01-07 14:55:49 -05:00
Callum Prentice
b552f7efe9
Merge with tip
2010-01-07 11:48:22 -08:00
Rick Pasetto
cbea2b235f
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-07 11:45:09 -08:00
Callum Prentice
fb99db68a0
Fix for EXT-3781 "installer on Vista: error opening file for writing ."
...
Reviewed by MW
2010-01-07 11:38:36 -08:00
Brad Payne (Vir Linden)
16773e0021
For EXT-4018: Wrong expansion behavior in inventory. Made process of finding the My Inventory folder more robust instead of assuming it was always the first child.
2010-01-07 14:16:06 -05:00
Rick Pasetto
b7bab35cb5
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-07 09:35:20 -08:00
Rick Pasetto
e73feb17c2
DEV-44129 EXT-3662 - Make all layout panels mouse_opaque
...
This makes the area below the controls click-through (otherwise it blocks mouse events).
That area is for the volume slider.
2010-01-07 09:35:04 -08:00
Nyx (Neal Orman)
27bd65129b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-01-07 11:36:22 -05:00
Nyx (Neal Orman)
80db391816
EXT-3973 viewer crash
...
Rendering cost calculations didn't handle the case of a face having no image
associated with it. Added in null checks before using the pointer to the image.
Crash no longer repros.
Code reviewed by Vir.
2010-01-07 11:36:11 -05:00
richard
ae274182a9
ext-4011 - sped up appearance of inspector affordances
...
reviewed by Erica
2010-01-06 17:53:57 -08:00
Rick Pasetto
3b32253d31
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-06 17:37:28 -08:00
Rick Pasetto
93dc1cd3b0
Make zoom level closer
2010-01-06 17:37:19 -08:00
Leyla Farazha
35bb14951f
Merge
2010-01-06 16:38:19 -08:00
Leyla Farazha
95f14d7313
changing lineeditor text positioning center logic from using llceil to llround
2010-01-06 16:37:06 -08:00
Leyla Farazha
2369ecc118
EXT-3824 [BSI] Rename Inventory Item Text Cutoff
...
EXT-3757 Text Placement is Too High when Editing Landmark/Outfit/Notecard Names
reviewed by Richard
2010-01-06 16:26:01 -08:00
richard
e28eac929b
EXT-4014 - Inventory folders should use "open" folder art...
...
reviewed by Leyla
2010-01-06 16:17:27 -08:00
Leyla Farazha
35d0ac3ba5
menu holder, tooltip view and snapshot floater should be in main_view as added in main_view.xml
...
reviewed by richard
2010-01-06 16:13:44 -08:00