Commit Graph

24677 Commits (e0f391df2a95192130bdfeb0d4f03ad6ca489eef)

Author SHA1 Message Date
Oz Linden e0f391df2a tag merge of DRTVWR-203 2012-08-22 08:46:03 -04:00
Oz Linden 79bf2c4929 merge changes for storm-1879 2012-08-16 11:00:55 -04:00
Oz Linden 0c903609d4 merge changes for storm-1895 2012-08-16 10:55:31 -04:00
Oz Linden 557376b95c merge changes for storm-1898 2012-08-16 10:41:10 -04:00
Oz Linden 39d79080c0 merge changes for storm-1899 2012-08-16 10:33:42 -04:00
Oz Linden a7d8b42509 merge up to latest viewer-development 2012-08-16 08:52:26 -04:00
Oz Linden b9e43dfd64 merge back beta fixes 2012-08-15 20:09:41 -04:00
Oz Linden f11ba76522 tag merge of DRTVWR-196 2012-08-15 18:04:51 -04:00
Oz Linden 97106c2dea merge changes for DRTVWR-194 2012-08-15 17:07:10 -04:00
Oz Linden f2eef65206 tag merge of DRTVWR-194 2012-08-15 17:06:48 -04:00
Oz Linden 981190cf31 merge back beta fixes 2012-08-14 18:41:25 -04:00
Oz Linden f4fb073ae0 open-146: correct licenses in llphysicsextensions stub 2012-08-14 18:30:11 -04:00
Oz Linden c2e2a49d9b merge changes for DRTVWR-193 2012-08-14 17:26:24 -04:00
Oz Linden 9a4a6163ff tag merge of DRTVWR-193 2012-08-14 17:26:07 -04:00
Oz Linden 3e3e695341 merge back beta fixes 2012-08-14 16:04:22 -04:00
Oz Linden ee3137b0ef merge changes for DRTVWR-195 2012-08-14 14:38:52 -04:00
Oz Linden 898b0fe213 tag merge of DRTVWR-195 2012-08-14 14:38:39 -04:00
Oz Linden 3bed396675 merge changes for DRTVWR-191 2012-08-14 13:29:01 -04:00
Oz Linden 96f8dddba9 tag merge of DRTVWR-191 2012-08-14 13:28:43 -04:00
Oz Linden 1e0470ac56 correct merge error 2012-08-14 12:41:48 -04:00
Oz Linden b50f23b899 merge back beta fixes 2012-08-14 09:02:43 -04:00
Oz Linden 24c1b62e27 merge back beta fixes 2012-08-14 09:01:56 -04:00
Oz Linden 9f6503a1fc merge changes for DRTVWR-192 2012-08-14 08:50:23 -04:00
Oz Linden f72c1d64c2 tag merge of DRTVWR-192 2012-08-14 08:50:06 -04:00
Merov Linden 1b639c33c5 VWR-29358 : Fix auto scroll to selection when the filter is active 2012-08-10 15:35:48 -07:00
Oz Linden 2c2167229e merge changes for DRTVWR-190 2012-08-10 08:08:55 -07:00
Oz Linden b53481354d tag merge of DRTVWR-190 2012-08-10 08:08:25 -07:00
Merov Linden c63dea6b91 MAINT-1197 : Fix inventory deselection/reselection when cutting items 2012-08-09 16:26:37 -07:00
Oz Linden 5f1230e911 MAINT-1342: correct initial login location handling, clarify the two related persistent settings 2012-08-09 11:52:48 -07:00
davep@spiral.lindenlab.com b9e650a3a1 MAINT-113 Fix for flashing property lines when selecting objects. 2012-08-09 11:47:14 -07:00
Nat Goodspeed 559b39c5d1 Automated merge with http://hg.secondlife.com/viewer-development 2012-08-08 18:27:52 -04:00
Nat Goodspeed 2d0e911256 Add implementation comments to LLHandle.
I recently tried to wade through llhandle.h and got somewhat perplexed. Armed
with an explanation from Richard, I've added notes to the file to try to make
it a bit less mysterious.
2012-08-08 14:57:49 -04:00
Nat Goodspeed 50f3e227a2 Move llhandle.h into llcommon; same generality as llpointer.h.
Leaving llhandle.h in llui restricts the set of viewer project directories
which could potentially use it, and there's nothing whatsoever UI-specific
about it.
2012-08-08 13:23:02 -04:00
Oz Linden 3379760965 merge changes for DRTVWR-189 2012-08-08 07:27:59 -07:00
Oz Linden 36e36b9497 tag merge of DRTVWR-189 2012-08-08 07:25:19 -07:00
Oz Linden 1ace064a58 Added tag DRTVWR-189 for changeset 9ee938778970 2012-08-08 05:26:57 -07:00
Oz Linden 261c10adf3 merge changes for DRTVWR-188 2012-08-07 19:42:45 -07:00
Oz Linden fba9c9e8dd tag merge of DRTVWR-188 2012-08-07 19:42:04 -07:00
Oz Linden 2571809dc0 tag merge of DRTVWR-181 2012-08-07 17:05:30 -07:00
Todd Stinson 493d3b3651 PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix for PATH-542. The viewer calculated rotation resulting from an object's angular velocity was being incorrectly reset when the corresponding object update was received. With this bugfix, the rotation resulting from the angular velocity is accumulated separately and is re-appplied when the object update resets the object's rotation. 2012-08-06 17:08:57 -07:00
Nat Goodspeed ac7f7366cd Remove jarring viewer log spam message -- unless it's true.
For as long as I've been paying attention to viewer logs, every run has always
stated -- in all-caps, no less! :
NOTE: ALL NOTIFICATIONS THAT OCCUR WILL GET ADDED TO IGNORE LIST FOR LATER RUNS.
I have always found that unsettling, having little desire to automatically
ignore notifications -- especially not whatever random set happens to manifest
during a particular run. However, over time I've learned that it seems to have
no actual impact. I've wondered (not too hard) what it actually *does* mean --
but generally I'm looking at a viewer log because I'm in hot pursuit of some
quite different problem.
Stumbling across the source for this message today in
LLViewerWindow::LLViewerWindow, I was shocked -- shocked! -- to find it was
being produced unconditionally! Therefore it has heretofore been utterly
meaningless log spam. It provided no additional information whatsoever to
anyone reading a log -- only that vague sense of unease.
Make this conditional on gSavedSettings.getBOOL("IgnoreAllNotifications"),
which would appear to be the original intent. Now its presence (or absence)
actually says something about internal conditions in the viewer.
2012-08-05 08:47:49 -04:00
Nat Goodspeed c77c43ae98 Make first-login popup button "Create Account"; remove embedded link.
Popup text used to end with the question:
Visit [[create_account_url] [SECOND_LIFE] web site] to create a new account?
presumably to set context for the buttons labeled "New Account..." and
"Continue". At Leo's request, remove the question and relabel the yes button
"Create Account...".
2012-08-03 15:33:07 -04:00
Nat Goodspeed e4e58f0095 When turning off create-account button, also turn off its title text.
Login-panel logic distinguishes "system grid" from "non-system grid." With
Oz's recent changes for pathfinding, now only agni and aditi are "system
grids;" anything else configured into grids.xml is a "non-system grid." The
difference is that when you select a "non-system grid" on the grid selector,
we turn off the "lost password?" link and the "create account" button -- since
how can we help with either if we don't recognize the grid? This logic already
existed, but only turned off the create-account button, leaving the new title
"CREATE YOUR ACCOUNT" over an empty corner of the login panel. Turn that off too.
2012-08-03 14:58:57 -04:00
simon@Simon-PC.lindenlab.com 09cb8a4780 Merge with lindenlab/viewer-development 2012-08-03 10:20:47 -07:00
Nat Goodspeed df767cef78 Manual cleanup from merge up to viewer-development.
Some viewer-development code had been moved, and so wasn't patched with my
panel_login layout changes; verified each of my llpanellogin.cpp commits
against new tip rev. Reformatted panel_login.xml in the spirit of the
preferred indentation scheme but with my layout changes.
2012-08-02 16:04:39 -04:00
Nat Goodspeed f1ff284569 Automated merge with http://hg.secondlife.com/viewer-development 2012-08-02 13:23:46 -04:00
Oz Linden 7fa426f4db tag merge of DRTVWR-186 2012-08-02 13:09:39 -04:00
eli f7861f2828 FIX INTL-100 Frrench linguistic fixes 2012-08-01 16:21:58 -07:00
eli 46f10dccb6 sync with viewer-dev for 'fr' 2012-08-01 13:40:39 -07:00
eli 4376848e15 sync with viewer-dev for 'ja' 2012-08-01 13:38:21 -07:00