440a050072
Fix viewer-2 build due to duplicate lines in a header merge.
2009-10-05 17:16:02 +00:00
c480ff056f
Fix viewer-2 build due to duplicate lines in a header merge.
2009-10-05 17:16:02 +00:00
92aaa37788
Tweak inspector tooltip icon spacing.
2009-10-05 16:17:51 +00:00
f9788fa6ce
merge -r 1890-1893 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
...
* Bugs: EXT-1217, EXT-1274, EXT-1272
* Dev: EXT-1101
2009-10-05 07:47:56 +00:00
2451b82d8a
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1887 https://svn.aws.productengine.com/secondlife/pe/stable-2@1888 -> viewer-2.0.0-3
...
* Bugs: EXT-1148
* New Dev: EXT-1140
2009-10-05 07:44:18 +00:00
8b8dfa2e2b
EXT-1224 Inventory list uses ugly fake-italics
...
Reviewed by Richard.
2009-10-04 11:04:19 +00:00
b5936ec0ad
Changed license to Viewer GPL to try to fix the Linux build export. Code consists of 4 function stubs, I don't think it's proprietary/internal.
2009-10-04 03:33:18 +00:00
cf395cc190
Removed a couple debug statements we no longer need.
2009-10-04 00:20:37 +00:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
b1a280841e
fix for DEV-40559: viewer crash when media texture appears while parcel media is loading.
2009-10-03 00:23:01 +00:00
a6db5fa24e
DEV-38978: remove reference to parcel owners in help text
2009-10-02 22:27:59 +00:00
fc16786d6f
DEV-38453 (part4) Modernize the foreign languages by
...
- moving some existing translations into strings.xml
- deleting sentences that were removed from EN in notifications.xml
- converting structures in floater_god_tools.xml
NO CHANGES TO ENGLISH
2009-10-02 21:48:32 +00:00
831a245612
DEV-38978: Remove reference to parcel owners in GUI
2009-10-02 14:42:45 -07:00
70edaea49c
QAR-1619: need to help Linux gcc figure out LLSD-to-string assignment
2009-10-02 14:16:03 -07:00
844d017f43
Moved a couple of C++-specific warning flags from GCC_WARNINGS to GCC_CXX_WARNINGS. This fixes a couple of non-fatal warning messages about unknown flags on the mac.
2009-10-02 14:12:34 -07:00
a3f11b1a99
QAR-1619: spurious capitalization of Llviewerprecompiledheaders.h made Linux build fail
2009-10-02 14:03:14 -07:00
3a0a287058
Patches follow merge to latest viewer-20 updates
2009-10-02 12:59:05 -07:00
b630e62ad4
EXT-261: Labels in /character/avatar_lad.xml are not localizable
...
- there were a bunch of missing strings from the original fix, causing a MissingString(..) error to the user
2009-10-02 19:12:40 +00:00
9e372a9a48
DEV-40452 Correct linguistic consistency in the LSL editor tooltips
...
- Set these tooltips for translate="false". We have decided not to localize these tooltips at this time.
2009-10-02 18:22:50 +00:00
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
80f27013b2
Temporarily disabling packaging of the event_host tarball until hg subrepo support is enabled on the parabuild cluster.
2009-10-01 19:13:44 -07:00
dde2153014
merge of latest lindenlab/svn-imports-viewer-20
2009-10-01 18:19:45 -07:00
85ea690d47
Color changes to overhead info, colors file cleanup.
2009-10-01 23:56:13 +00:00
073a5df37c
Merge fix, line was deleted.
2009-10-01 23:27:14 +00:00
7cdca27174
L10N: cleanup text only, NO CODE changed
...
- G*d kills a kitten every time you put a hard return in the middle of a localizable sentence.
2009-10-01 23:04:08 +00:00
5143879a5b
unborking build.
...
fixed lltransientfloatermgr.cpp addFocusChangeCallback
commenting out LLFLoaterIM setFocusLostCallback for now.
2009-10-01 23:03:50 +00:00
d0a09f74ff
Added webkit browser_profile dir to .hgignore file.
2009-10-01 15:44:41 -07:00
0cb7a41f5f
DEV-40452 Correct a FEW MORE inconsistencies in the 3 new LSL editor tooltips
...
- string changes only, NO CODE changed.
2009-10-01 22:37:42 +00:00
df97615ffc
linux updater fixes - use the same new standard substitution strings as the viewer.
2009-10-01 21:57:05 +00:00
0d0840de0e
Routing mt.exe output to NUL to hopefully fix expected error build failures...
2009-10-01 14:51:35 -07:00
45c053b87d
Fix yet another error in building llqtwebkit.lib, this time the release lib really links only to the release CRT.
2009-10-01 14:41:57 -07:00
1713a3552b
merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
...
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)
2009-10-01 17:52:30 +00:00
cf9814bc05
EXT-332: Updated the visual style of the Buy L$ floater based on
...
Erica's design. Now any errors during the L$ purchase process will
give you a nice prompt to visit the SL website.
Replaced all user-visible references to the illegal term "currency"
with the term "L$".
Also fixed an outstanding bug with this floater: if you clicked the
Buy button but then cancelled the confirmation dialog, then the Buy
button would remain disabled. Now the Buy button is only disabled
during periods when you actually cannot buy.
Added initial support for local currencies, with the use of a new
[LOCALAMOUNT] field in the XUI files. When the XML-RPC server can
actually return local currency details, we can hook this up by just
changing llcurrencyuimanager.cpp.
Discussed XML-RPC interaction with Morpheus. Thanks to Erica for
the images and first cut at the XUI.
2009-10-01 17:52:20 +00:00
f05df68656
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3
...
* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)
2009-10-01 17:44:44 +00:00
090977608d
DEV-39995: the help browser would crash on open if the media ctrl
...
returned no media plugin for text/html (NULL dereference), which seems
to be happening in viewer-2.0.0-3 for me at the moment.
Clearly there's not too much to do if we can't display HTML, but this
fix will at least stop the help browser from crashing.
2009-10-01 10:23:23 +00:00
a0a5c8e615
EXT-1251: strip leading/trailing whitespace from user input in the
...
navigation bar when trying to access if the input is a valid SLURL.
2009-10-01 09:52:05 +00:00
cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
8135ddac02
L10N: typo and inconsistency in a tooltip of panel_login.xml
2009-10-01 02:02:31 +00:00
292aecbb3e
Updated test_win32_manifest.py to throw custom exception objects, rather than relying on string comparison.
2009-09-30 18:57:00 -07:00
0c0b59e104
New llqtwebkit package that has no embedded manifests.
2009-09-30 18:55:55 -07:00
57969e41db
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
2009-09-30 21:44:20 -04:00
eca30a2262
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
2009-09-30 21:42:04 -04:00
af39853e7c
DEV-40702 update viewer2 vivox sdk to v3
2009-10-01 00:23:26 +00:00
6519828508
DEV-14830 add'l fix
...
Copy-paste caused duplicate control and widget names in the script errors checkbox & radio buttons; Need to fix this before code is written for it.
Need a unique name= for localization
2009-09-30 21:59:50 +00:00
706b67622a
DEV-39781 VWR-15246: LSL compiler typo in the tooltip for 'attach'
...
- edited 2 words in the file
2009-09-30 18:17:32 +00:00
a0596b4d5c
DEV-40452 VWR-15527: Correct small errors and linguistic consistency in the LSL editor tooltips
...
- also fixes the specific cases of VWR-3766, VWR-1794
- string changes only, NO CODE changed.
- this is needed so that we can begin the Localization round
2009-09-30 18:15:37 +00:00
feabeb4965
DEV-35039 Viewer 2.0 Help System - Viewer Development
...
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
a3ba111e39
Cherry pick of simple fix for duplicate inventory folders (one non working) in some inventory panel views.
...
Result of:
svn merge -c 134827 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
2009-09-30 16:05:41 +00:00
6c70154cd1
converted focus change callbacks to use signals
...
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt
reviewed by Leyla
2009-09-30 01:00:51 +00:00
9b8b057164
Merge
2009-09-29 16:20:20 -07:00
James Cook