49bdfd7fbb
Merge
2010-03-04 13:49:14 -08:00
4c342ea57c
CT-575 DA xlation, new files
2010-03-04 13:48:00 -08:00
bb2b916fec
CT-575 DA xlation
2010-03-04 13:47:46 -08:00
f8916165f9
automated merge viewer2.0->viewer2.0
2010-03-04 15:31:35 -05:00
2a60fdb197
EXT-5296 : Inventory folders revert to defort "sort" with each login
...
Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code. Makes this sorting code a lot easier to debug.
2010-03-04 15:29:49 -05:00
f5b63df813
VWR-18007
2010-03-04 12:20:54 -08:00
b35ffd5304
Fix for EXT-5935
...
Decrease PluginInstancesCPULimit default value from 1.0 to 0.9.
2010-03-04 11:36:29 -08:00
1201b24d41
Merge
2010-03-04 11:23:56 -08:00
96fd925349
Merge
2010-03-04 11:21:14 -08:00
50cc48de28
merge.
2010-03-04 19:20:28 +00:00
982aec721f
EXT-5296 : Inventory folders revert to defort "sort" with each login
...
Not my code, but ended up being a simple enough XML fix. Inventory sorting settings have changed in viewer2 from viewer1.23, this seems to be causing at least a couple of bugs. Fixed one, filing the other.
2010-03-04 14:18:38 -05:00
d0cd8f94db
cycle6 DE JA xlation, new files
2010-03-04 11:12:01 -08:00
9fe4f49079
cycle6 DE JA xlation; beta 4 DE linguistic fix
2010-03-04 11:11:44 -08:00
462a49fb9d
EXT-5919 Clean up fuzzy type in Buy L$
2010-03-04 11:06:11 -08:00
3d81e9e7f1
PE merge.
2010-03-04 17:33:55 +00:00
e57cba8dcf
merge.
2010-03-04 17:24:34 +00:00
7498504c92
EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
...
Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04 17:22:22 +00:00
57f4565bb8
merge
...
--HG--
branch : product-engine
2010-03-04 18:31:51 +02:00
0f66645e9b
Refixed Major bug EXT-3852 ([BSI] Tabs in Tabbed Instant Messaging do not auto focus the text field when clicked)
...
- set in floater_im_session.xml default tab groups over view hierarchy to have input field as a default widget.
For now LLUICtrl::focusFirstItem called from Tab container gets input editor as "first item" & sets focus to it
--HG--
branch : product-engine
2010-03-04 18:29:52 +02:00
def35926db
ext-4657 changed inappropriate llerrs to llwarns
...
reviewed by Lynx
2010-03-04 16:14:01 +00:00
d94826a5e6
merge
...
--HG--
branch : product-engine
2010-03-04 17:53:08 +02:00
e76a091184
merge
...
--HG--
branch : product-engine
2010-03-04 17:49:33 +02:00
70000e0b1e
Fixed Win build.
...
--HG--
branch : product-engine
2010-03-04 17:08:21 +02:00
a9b829f371
Fixed low bug EXT-5998 - Classified is scrolled if previos classified was scrolled.
...
--HG--
branch : product-engine
2010-03-04 16:55:00 +02:00
99f5cc8151
merge
...
--HG--
branch : product-engine
2010-03-04 16:53:21 +02:00
496e6e1948
Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.
...
Disabled for now.
2010-03-04 14:30:57 +00:00
768c956e98
Merge from default branch
...
--HG--
branch : product-engine
2010-03-04 16:28:45 +02:00
da50434ada
Merge backed out revision
...
--HG--
branch : product-engine
2010-03-04 16:22:55 +02:00
ce27036017
Backed out changeset: 0160afd678a5
...
Implemented solution fixed bug caused by changes made for EXT-3852 (07f21c92896f & 07f21c92896f).
For now previous changes for EXT-3852 are reverted.
So, changes for EXT-4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater) are unnecessary.
--HG--
branch : product-engine
2010-03-04 16:22:31 +02:00
6f4388499b
Merge of reverted fix of EXT-3852
...
--HG--
branch : product-engine
2010-03-04 16:14:04 +02:00
18d229a25b
Merge
...
--HG--
branch : product-engine
2010-03-04 16:07:47 +02:00
dea244dcea
Backed out changeset: 07f21c92896f
...
reverted fix for (EXT-3852 Tabs in Tabbed Instant Messaging do not auto focus the text field when clicked)
Previously implemented solution conflicts with test case in EXT-5387.
--HG--
branch : product-engine
2010-03-04 16:06:58 +02:00
59d3087700
Backed out changeset: 317082ea4701
...
reverted fix for (EXT-3852 Tabs in Tabbed Instant Messaging do not auto focus the text field when clicked)
Previously implemented solution conflicts with test case in EXT-5387.
--HG--
branch : product-engine
2010-03-04 16:05:05 +02:00
997e91f08e
Fixed major bug EXT-5943 - Classifieds are Published and charged as soon as you hit Save.
...
Added Publish Classified floater to confirm classified creashion and publishing.
--HG--
branch : product-engine
2010-03-04 16:05:04 +02:00
bb4e48e1d1
merge
...
--HG--
branch : product-engine
2010-03-04 15:44:17 +02:00
b6d5909ddc
partitial fix for major EXT-4820 [NUX] Viewer dimensions on first-run
...
need to specify desctop width and height for macos and linux (see LLDesctopInfo in llsys.cpp for details)
--HG--
branch : product-engine
2010-03-04 15:43:14 +02:00
5b0625880a
partial fix for EXT-4819 [NUX] New Application Icon Integration
...
only the obvious icon files are replaced
--HG--
branch : product-engine
2010-03-04 15:40:35 +02:00
85e698fa72
fixed reopened EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS auto-response
...
--HG--
branch : product-engine
2010-03-04 15:24:22 +02:00
c222c6c08a
Fixed normal EXT-4798 (Voice notifications steal keyboard focus by default)
...
--HG--
branch : product-engine
2010-03-04 13:41:04 +02:00
e76f673cc2
Related to major EXT-4105 ([BSI] group names are not able to be copied from side panel) - added ability to copy group names from group info panel title.
...
--HG--
branch : product-engine
2010-03-04 13:39:54 +02:00
6a66b820bd
merge
2010-03-04 11:18:41 +00:00
0778175f80
Backed out changeset 3ed4974eb9ca
...
was: EXT - 5891 (Login location defaults to My Home)
backing this out because, although it sucks, it's per-spec :/
2010-03-04 11:18:32 +00:00
c4987fde9f
More PE merge (revert some of these to trunk versions - PE shouldn't be changing the translated files I reckon)
2010-03-04 10:52:44 +00:00
87c986dc58
PE merge.
2010-03-04 10:51:49 +00:00
929129482d
Updated major sub task EXT-5857 - location, content type, category, description in the Classified Info panel have no labels.
...
Updating padding because texture and name field are too close(introduced in 10127:4b36b7d75399)
--HG--
branch : product-engine
2010-03-04 12:19:54 +02:00
5301d4189f
Updated major sub task EXT-5858 - Assigned picture is stretched in the Classified Info panel.
...
Fixed reshape issues.
Added stretching to edit classified panel.
--HG--
branch : product-engine
2010-03-04 12:18:24 +02:00
6d5442fbbd
Fixed windows build.
...
--HG--
branch : product-engine
2010-03-04 09:22:55 +02:00
3614dc0073
Potential fix for EXT-5850 (Crash in LLPluginClassMedia::idle)
...
We don't actually have a repro for this bug, just a number of crash reports.
This potential fix makes an iterator loop safer in the face of the iterator changing during the loop. See the jira for further details.
Reviewed by Richard at http://codereview.lindenlab.com/331008
2010-03-03 17:13:14 -08:00
24f544a1bf
cycle6 FR xlation, new file
2010-03-03 16:17:18 -08:00
3593056448
cycle6 FR xlation
2010-03-03 16:17:00 -08:00
Eli Linden