3db7dd4541
L10N: used consistent terms between Pref > Advanced and floater_select_key !
2009-12-14 16:33:47 -08:00
0d9bae83ed
merge
2009-12-14 14:54:37 -08:00
861640adf9
merge
2009-12-14 14:35:24 -08:00
7f0e7a1fed
manually merge
2009-12-14 14:33:48 -08:00
4a2d57ad48
Merge
2009-12-14 14:32:31 -08:00
caaf0173aa
Added EOL to file for Mac/Linux platforms
2009-12-14 14:13:55 -08:00
180daf3ab8
Merge with Tip
2009-12-14 14:10:16 -08:00
2313867f9b
EXT-1940 combo-box with dropdown list of scales overlaps Cancel btn un the Texture dlg
2009-12-14 16:45:14 -05:00
894a5006b3
Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media Settings : Controls tab"
2009-12-14 13:20:23 -08:00
36dae1c1a0
merge
2009-12-14 13:07:28 -08:00
f0654410b6
ext-3297 Input/Output devices are cut off in preferences
2009-12-14 15:58:01 -05:00
5b6e4577ae
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-14 12:04:05 -08:00
da3ca7c5b9
Allow selection of media faces even if there is no impl. We record
...
the target object and use that fact to raise its interest level.
This is mostly a pass-off for monroe to take and run with
2009-12-14 12:03:44 -08:00
d9ddaf4c2f
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-14 12:00:36 -08:00
d9f022da71
EXT-3338 Start up screen isn't resized - reviewed by richard, The Layoutmaster
2009-12-14 12:00:17 -08:00
93f827ec78
Merge latest viewer 2-0 changes into media
2009-12-14 11:23:00 -08:00
cbeadddbaf
automated merge viewer2.0->viewer2.0.
2009-12-14 14:16:57 -05:00
9778c3d7b3
EXT-3407 : "Recent Items" panel shows as empty
...
The text in the search editor is now properly kept updated.
2009-12-14 14:01:16 -05:00
962a42a331
Merge
2009-12-14 09:07:07 -08:00
a9e409c707
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-14 11:58:08 -05:00
0300b81414
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-14 16:21:57 +00:00
7b2f4b6169
EXT-3426: Update Place buttons based on state.
...
We now disable the teleport/map buttons when they cannot be used (when
we don't have a global 3D position for the parcel). We also update
this button enable state at the right times.
2009-12-14 16:21:15 +00:00
94a9b1ed0d
EXT-3426: Enable Teleport/Map buttons for all Places.
...
When we open the Places side tray for a parcel, given a UUID, we now
look up the parcel's global 3D position so that the teleport and map
functions work correctly.
2009-12-14 15:53:03 +00:00
b1d4502018
automated merge avp->viewer2.0
2009-12-14 10:46:02 -05:00
aad8d99af2
automated merge viewer2.0->viewer2.0
2009-12-14 10:39:59 -05:00
88b73b1146
For EXT-3264: Missing separators in inventory context menus - restore
...
--HG--
branch : avatar-pipeline
2009-12-14 09:34:42 -05:00
76f062f1fe
Fix Mac build
2009-12-13 21:43:28 -08:00
1afef521ce
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-13 14:15:03 -08:00
6d444398e9
EXT-3422 Add IM/Notification pending button art, style and layout of overflow arrows, align message well with bottom bar
2009-12-13 14:13:42 -08:00
a763409647
EXT-2764 EXT-2766 add and remove help ids to reflect reality
2009-12-13 12:17:55 -05:00
b8ac919d6f
merge
...
--HG--
branch : avatar-pipeline
2009-12-12 15:50:01 -05:00
4019c79a27
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-11 20:58:20 -07:00
b79d694f6d
replace some magic numbers of http status, and fix for DEV-40952/SNOW-208: HTTP GET requests for textures check for http status 203, but should check for 206.
2009-12-11 20:51:06 -07:00
417083068d
EXT-3278: copy & wear in object inventory is now only enabled if we can wear contents
2009-12-11 21:37:36 -05:00
5e4d7ec715
In LLPluginProcessParent, instead of killing the plugin process, terminate it by closing the sockets. This lets it do some cleanup before exiting, instead of just getting shot.
2009-12-11 17:50:59 -08:00
19d9cf8d8e
ext-3404 - script editor scrolls to the bottom and sticks
2009-12-11 16:48:05 -08:00
9ad76199e5
fixed a regression that caused bottom 15 pixels of scrollable text editors to appear blank
2009-12-11 16:25:38 -08:00
ae8c1d1ea8
For EXT-3264: Missing separators in inventory context menus - restore
...
--HG--
branch : avatar-pipeline
2009-12-11 18:49:29 -05:00
943e1fbe02
Merge
2009-12-11 15:46:41 -08:00
3e75137f26
EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.
...
Background fetches track whether they're being done on MyInventory, Library, or both.
Also did some cosmetic header file cleanup.
2009-12-11 18:13:54 -05:00
c6234f352a
variable renames in LLTextBase
2009-12-11 14:34:30 -08:00
6f71bc704a
DEV-40452 (followup) Correct a few more inconsistencies in the 3 new LSL editor tooltips
2009-12-11 14:31:03 -08:00
7ca1bfc78d
fix multiple heads in repo
...
--HG--
branch : avatar-pipeline
2009-12-11 17:29:04 -05:00
d5a58c20a8
merge
2009-12-11 13:51:42 -08:00
401a51cac1
note to get rid of hack
2009-12-11 13:50:54 -08:00
b8fdf82510
fix for ellipses not appearing in single line text widgets
...
fix for ellipses sometimes appearing at end of wrapped line of text
reviewed by James
2009-12-11 13:50:40 -08:00
c400132f02
Merge
2009-12-11 13:49:19 -08:00
fce0d168ae
EXT-3233 Button label vertical placement cannot be adjusted via xml
...
Added bottom_pad attribute to widgets/button.xml and removed old
LLBUTTON_VPAD global and ButtonVPad saved setting.
Reviewed with Richard.
2009-12-11 13:48:35 -08:00
9c0d3e4e86
resolving sidepanel conflict
...
--HG--
branch : avatar-pipeline
2009-12-11 13:17:19 -08:00
99590047eb
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
Ramzi Linden