Ramzi Linden
126c6feed5
preserve a prior helpful tool_tip in 2.0 for the Build > Texture > 'Align' button
2009-12-01 16:47:52 -08:00
James Cook
b79afea3d0
merge
2009-12-01 15:01:57 -08:00
James Cook
db9f74d550
merge
2009-12-01 15:01:14 -08:00
Justin C. Rounds (Chuck)
ef92508aa1
Adjusted the value of UILineEditorVPad to give more room for text in text fields.
2009-12-01 18:00:16 -05:00
James Cook
a63d01b8bc
merge
2009-12-01 14:59:56 -08:00
James Cook
52a6fd6b33
Test floater for nearby chat text clipping problem
2009-12-01 14:59:40 -08:00
Justin C. Rounds (Chuck)
c109fa9ec6
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-01 17:21:37 -05:00
Justin C. Rounds (Chuck)
69ad211a00
Made context menus opaque to improve readability, especially in areas like Inventory where the menu appears in front of text.
...
http://jira.secondlife.com/browse/EXT-2622
2009-12-01 17:20:13 -05:00
James Cook
b3a424a7e3
EXT-2888 'Parcel Variable Icons' don't follow right edge of nav bar
...
Needed follows flags set
2009-12-01 13:58:01 -08:00
skolb
a0c133f819
Merge
2009-12-01 13:35:07 -08:00
skolb
0ab6d36094
Merge
2009-12-01 13:34:16 -08:00
Leyla Farazha
6a38dd3bac
merge
2009-12-01 13:27:23 -08:00
James Cook
6a888b653a
merge
2009-12-01 13:04:12 -08:00
James Cook
bbddb24739
Fix Linux/Mac builds due to LLToolDragAndDrop member function pointers
2009-12-01 13:03:35 -08:00
Eric M. Tulla (BigPapi)
7111e38cc9
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-01 15:54:31 -05:00
Eric M. Tulla (BigPapi)
de6222a56d
EXT-2719 - put on menu now gets disabled if the object is locked
2009-12-01 15:53:26 -05:00
Lynx Linden
7e02c71cf5
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-01 20:40:41 +00:00
callum
55f4ad3dc8
Fix for "DEV-43581 - EXT-2901: [BSI] Can't access twitter pages directly via MoaP"
2009-12-01 11:47:38 -08:00
James Cook
dd6fa93d84
merge
2009-12-01 11:47:13 -08:00
James Cook
8025c15a71
merge
2009-12-01 11:45:45 -08:00
James Cook
594f96b92e
Merge - backing out scroll container change
2009-12-01 11:45:11 -08:00
James Cook
0ae508c99b
Revert partial fix for EXT-2572 (chat history text clipping) that causes EXT-1597
...
(script editor scrolls upward while typing)
Backed out changeset: e38642e0c21c
2009-12-01 11:44:49 -08:00
Leyla Farazha
90572936e8
merge
2009-12-01 11:32:23 -08:00
James Cook
d5d1db8833
EXT-3015 Fixed right and center aligned text boxes
...
Document rect left edge was being computed incorrectly.
Made floater_test_textbox.xml have more examples of text.
Reviewed with Kelly
2009-12-01 11:29:33 -08:00
Leyla Farazha
dee4849616
EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache)
...
EXT-2652 Favorites bar drop-down button (for when favorites exceed width of viewer) is not configurable via XUI
EXT-2227 [BSI] Preferences -> Setup -> Cache Location blank
EXT-1036 Clicking menu separators selects wrong menu option (allows selection of greyed-out option)
reviewed by James
2009-12-01 11:26:43 -08:00
Lynx Linden
9f403ee16f
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-01 19:00:11 +00:00
Justin C. Rounds (Chuck)
21a2cae999
Increased width of drop-downs in floater_tools.xml
...
Discovered bug: active drop-down missing art. Fixed in textures.xml.
http://jira.secondlife.com/browse/EXT-2674
2009-12-01 13:48:11 -05:00
Lynx Linden
3b340326cb
EXT-332: Hide international billing features until enabled.
...
The international billing links and labels in the Buy L$ floater are
now hidden by default. They will only be displayed once we get an
estimate from the server that includes an "estimatedLocalCost" token,
i.e., we are connected to a server that has the international billing
functionality enabled.
This is done so that the new functionality in Viewer 2.0 is not
exposed to the user until the international billing features are live
(which is scheduled to happen after the Viewer 2.0 release date).
2009-12-01 18:06:36 +00:00
Loren Shih
27351b8bf5
automated merge for viewer-2.0 -> avp.
...
--HG--
branch : avatar-pipeline
2009-12-01 12:52:21 -05:00
Loren Shih
c361ee1337
Automated merge for avatar-pipeline pull
...
--HG--
branch : avatar-pipeline
2009-12-01 12:46:15 -05:00
Loren Shih
f0f0572868
EXT-2964 : Can drag-and-drop a folder with links onto an object
...
EXT-3012 : Cleanup LLToolDragAndDrop
Now checking if folder contents have links before allowing object drop.
Did some superficial cleanup of lltooldraganddrop files.
--HG--
branch : avatar-pipeline
2009-12-01 12:43:36 -05:00
Loren Shih
fe9a705709
EXT-2922 : 2nd inventroy shouldn't list "New Window" as an option, since it silently fails
...
Fixed the behavior so that New Window brings up a new floater inventory window instead of doing nothing.
--HG--
branch : avatar-pipeline
2009-12-01 12:41:13 -05:00
Justin C. Rounds (Chuck)
16d947e473
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-01 12:24:44 -05:00
Justin C. Rounds (Chuck)
aa1cbd144f
Increased height on object content inventory panel.
...
http://jira.secondlife.com/browse/EXT-2906
2009-12-01 12:23:53 -05:00
Brad Payne (Vir Linden)
e8ec98c307
line ending fixes
...
--HG--
branch : avatar-pipeline
2009-12-01 12:06:31 -05:00
James Cook
5e11affddb
merge
2009-12-01 08:51:32 -08:00
Tofu Linden
677938e653
merge.
2009-12-01 16:42:22 +00:00
Tofu Linden
ac8a710532
Merge the major new voice SDK version from Vivox ('mossbuild1')
2009-12-01 16:40:43 +00:00
Justin C. Rounds (Chuck)
bf34e572e7
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
2009-12-01 10:55:00 -05:00
Justin C. Rounds (Chuck)
4c8b40a8f3
Changed UISpinctrlBtnHeight to match art.
...
http://jira.secondlife.com/browse/EXT-1621
http://jira.secondlife.com/browse/EXT-1669
http://jira.secondlife.com/browse/EXT-1671
2009-12-01 10:54:00 -05:00
Lynx Linden
8b75c21549
merge
2009-12-01 13:22:06 +00:00
Lynx Linden
5285a02823
EXT-2765: Added help IDs for tabs in the Places sidebar.
...
The issue was that the widgets for this panel are not built solely
from XUI. There's code in LLPanelPlaces::changeInventory() that
creates the actual My Inventory and Teleport History panels. Adding
help_topic strings to the relevant XUI files for the LLLandmarksPanel
and LLTeleportHistoryPanel classes fixes this issue.
2009-12-01 13:17:31 +00:00
Tofu Linden
f0808dbf0f
version number tweakery in About dialog.
...
vivox 'Unknown' is the more-descriptive '(Not Connected)' now.
plus, we admit that our Qt version number is hard-coded right into the viewer instead of asking Qt.
2009-12-01 13:08:04 +00:00
Lynx Linden
3a2fcad0cb
DEV-41358: pass localization information to the Search web pages via a
...
new ?lang=<LANG> query parameter.
2009-12-01 13:07:41 +00:00
Lynx Linden
bd4c1fa8d8
DEV-40702: Internationalize the unknown Vivox version string rather
...
than hardcode it in llvoiceclient.cpp. Also rename the string from
"Unknown" to "Not connected", to better reflect the fact that we get
the Vivox version once voice is connected.
2009-12-01 10:52:04 +00:00
Steve Bennetts
c760220b00
Merge from product-engine
2009-11-30 19:15:29 -08:00
callum
6dd3f54924
Simple fix for Hg merge tool shittiness..
2009-11-30 17:55:19 -08:00
James Cook
78626b7f6c
merge
2009-11-30 17:36:48 -08:00
James Cook
c81e5f22c0
Clean up test XML
2009-11-30 17:36:37 -08:00
James Cook
93ab50efd2
Bump Parabuild
2009-11-30 17:36:10 -08:00