Commit Graph

13745 Commits (7c2b9221d6678ea7a04f529efaa2e557abce504d)

Author SHA1 Message Date
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Dave Parks db85c5b327 Switching build location to public as discussed. 2010-09-27 12:57:39 -05:00
Tofu Linden e6688f993f merge 2010-09-27 17:49:03 +01:00
Kelly Washington fa22f0a6f8 Merge 2010-09-27 09:42:27 -07:00
Tofu Linden 595cbb77d2 merge storm-153 re-fix. 2010-09-27 16:56:01 +01:00
Tofu Linden 980f111072 merge storm-228 2010-09-27 16:55:20 +01:00
Tofu Linden c5fb763d11 merge storm-190 2010-09-27 16:54:51 +01:00
Tofu Linden 014eb72f1f merge storm-173 2010-09-27 16:54:14 +01:00
Andrew Productengine 09ef4a2417 STORM-153 ADDITIONAL FIX Properly fixed unlocalized chiclet tooltip and syswell session names for adhoc.
Bug was caused by using unlocalized name of session as argument in LLIMModel::newSession() after the session name was localized in constructor.

- Used correct session name in LLIMModel::newSession(). Adding similar logic to addMessage() turned out to be unnecessary and also caused regression (VWR-23180),
so previous fix of the same bug(8ab901af1241) was backed out in 28ed1b4cf4cd. Erroneous part was excluded from this fix.
2010-09-27 18:18:03 +03:00
Paul Guslisty 05043257e4 STORM-228 FIXED 'Loading / Done' text is cropped on the bottom of 'Find' floater
-Increased space between bottom of the floater and bottom of the web browser (inside floater), so that 'Loading / Done' text
 between bottom of the web browser and bottom of the floater won't be cropped
2010-09-27 17:12:14 +03:00
Sergei Litovchuk 0d6f80d737 STORM-190 FIXED text truncations in floater EDIT CONTENT PERMISSIONS.
- Increased overall floater width.
- Increased permissions columns width.
- Increased 'Check All' and 'Clear' buttons width.
- Applied text wrapping to permissions labels.
- Removed 'NextOwnerLabel' dimensions overrides for German.
- Removed 'Check All' and 'Clear' buttons dimensions overrides for Polish.
2010-09-27 16:03:31 +03:00
Dave Parks 1e01550333 Fix for foldertype_bad_lookup nonsense (requires clearing of cache and bad_lookup folder and/or a fresh inventory copy from agni to take effect). 2010-09-25 01:35:31 -05:00
Dave Parks cd9d1685e9 merge 2010-09-24 23:52:49 -05:00
Dave Parks 35c81f75ac Fix for bad zipping of meshes and add mesh icon back to repository. 2010-09-24 23:52:32 -05:00
Kelly Washington 753238d70e VWR-21377 Script editor ctrl-f fix.
make ctrl-f work from the script search box itself.
2010-09-24 16:54:28 -07:00
Kelly Washington f3b01596dd VWR-21377 Script editor ctrl-f fix.
change to better / more consistent naming
2010-09-24 16:31:43 -07:00
Kelly Washington 0931799f03 VWR-21377 Script editor ctrl-f fix.
let some LLViews handle shortcut keys if they want.
reviewed with ambroff
2010-09-24 15:57:17 -07:00
Merov Linden 214cdc4177 STORM-173 : Add Build > Object > Return Object 2010-09-24 15:38:21 -07:00
prep linden 36f25e43a9 Merge 2010-09-24 17:35:29 -04:00
prep linden 40150f31ce Fixed a mesh upload issue where if the asset did not contain a rig the avatar would disappear for the current session. 2010-09-24 17:19:44 -04:00
Dave Parks 3e2eb3ee4f merge 2010-09-24 13:39:42 -05:00
Dave Parks b7cf948a82 SH-213 Fix for crash when selecting face. 2010-09-24 13:39:15 -05:00
prep linden c7f5a9419b Added support for joint offsets 2010-09-24 13:11:53 -04:00
Tofu Linden b34856d66d merge storm-189 redux 2010-09-24 14:58:56 +01:00
Monroe Linden b25d969b61 Pulling one bugfix changeset from another repository. 2010-09-23 18:39:54 -07:00
Richard Linden 054e023bfe merge 2010-09-23 16:45:48 -07:00
Richard Linden df25093a76 fix for llviewernetwork integration test 2010-09-23 16:45:40 -07:00
Monroe Linden 568496eb32 Fixed some build errors in llmediaplugintest.cpp.
Reviewed by Richard.
2010-09-23 16:30:30 -07:00
Nyx (Neal Orman) e0588af087 SH-211 FIX use updated tcmalloc lib on linux
Previous version was rejected by our build machines. This update was
build with -fno-stack-protector, so should be able to be built by
teamcity.
2010-09-23 19:04:52 -04:00
Richard Linden 7f929cc288 dummy commit to track experience team work:
EXP-11 UI Optimizations
EXP-12 Selective Pop-up Blocking
EXP-5 UI Hints
EXP-6 Side Panel Tutorial
EXP-3 Enable Pop-up Web Content
EXP-13 Javascript Handling
EXP-56 Add support for file picking to LLQtWebKit and hook up to media plugin
EXP-59 Some buttons disappear when clicked
QAR-3491 "Tutorial in the side panel"
QAR-3448 "UI Hints Experience Sprint 1"
QAR-3440 "Pop-Up Web Content in Viewer Experience Sprint 1 QAR"
QAR-3439 "UI Performance Improvements Experience Sprint 1 QAR"
2010-09-23 15:27:37 -07:00
Seth ProductEngine 8257240777 STORM-189 FIXED Truncations in DE ans ES locales in Build Tools floater.
- Some checkboxes moved in DE locale and EN xml file.
- Removed floater width override for ES locale.
2010-09-24 00:53:21 +03:00
Richard Linden 58ac85223e merge 2010-09-23 14:08:50 -07:00
Nyx (Neal Orman) f73a0c2e13 Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-23 16:46:08 -04:00
Nyx (Neal Orman) 1ac289bac9 SH-211 FIX update viewer-mesh branch to use new tcmalloc package
Finished changes to make viewer-mesh make use of tcmalloc on linux.
Almost all changes are juggling cmake config files, to make sure
that the package is downloaded, installed, moved at the right times,
and linked at the right times.

Code reviewed by Seraph
2010-09-23 16:46:02 -04:00
Christian Goetze (CG) 92195c479f Merged support for platform specific permanent quick links to the installer 2010-09-23 12:56:31 -07:00
Christian Goetze (CG) 78e52f4042 Add support for platform specific permanent quick links to the installer 2010-09-23 12:55:20 -07:00
Brad Payne (Vir Linden) ec88d21c56 merge 2010-09-23 15:44:17 -04:00
Richard Linden fbcbfb8805 merge 2010-09-23 12:00:17 -07:00
Nyx (Neal Orman) 7f9285979d WIP make tcmalloc work on linux (JIRA pending)
First pass at integrating the linux version of tcmalloc.

Code will be reviewed in a later commit before pushing.
2010-09-23 14:59:03 -04:00
Aimee Linden 18bd7dfae7 STORM-199 Merge 2010-09-23 18:17:41 +01:00
Andrew Productengine 4ddf507d28 STORM-153 ADDITIONAL FIX Fixed unlocalized chiclet tooltip and syswell session names for adhoc.
Bug was caused by using incorrect (unlocalized) name of session as argument for some methods after the session name was localized in constructor.

- Used correct (localized) session name instead.
2010-09-23 19:25:30 +03:00
Nyx Linden ea2e53065b Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/ 2010-09-23 11:26:03 -04:00
Nyx Linden 245842a765 SH-64 update GLOD on mac
updated GLOD again to be searched for in the correct place and
updated some cmake configuration to ensure that it is being referred to
in the correct places.

This appears to finally solve our mac startup crash.
2010-09-23 11:25:40 -04:00
Tofu Linden 607d67d152 merge storm-206 2010-09-23 14:32:18 +01:00
Tofu Linden 904776288c merge 2010-09-23 13:46:11 +01:00
Tofu Linden 0f391c6ac9 Backed out changeset acb451f83a9d
original commit log for acb451f83a9d was: "Temporary changes to allow the viewer to build against an older version of llqtwebkit.
NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out."

So, yes, I'm backing that out.
2010-09-23 13:46:00 +01:00
Tofu Linden 438e42edcf Linux rebuild of llqtwebkit from the following sources:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)
2010-09-23 13:45:12 +01:00
Aimee Linden 7f0bcfae49 STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory. 2010-09-23 13:17:58 +01:00
Aimee Linden 8e67a60528 STORM-128 FIXED New friends list permission icons
* Added new icon artwork.
* Reordered the icons so that the most common ones are to the right, so that they change position as little as possible.
* Removed old 1.23 icons.
2010-09-23 12:13:43 +01:00
Andrew Productengine c096e209ab STORM-201 FIXED Substituted link to widgets page on internal LL wiki in test floater with external one. 2010-09-23 11:39:29 +03:00