Commit Graph

24832 Commits (97ee3003ffddb7cd2f8a8a2768101a8065ae1fe3)

Author SHA1 Message Date
Aura Linden 5624f03b9c Changed CMake to work for older and newer versions of OSX 2012-07-23 12:34:02 -07:00
prep c3702aab3b Fix for path-826. Safeguarding against a mull weight being used 2012-07-23 14:25:44 -04:00
Oz Linden 42cc602732 fix finding havok libs in relwithdebinfo mode (uses release unless LL_DEBUG_HAVOK is used 2012-07-21 08:47:36 -07:00
Oz Linden 12b1ec6264 refactor to build llphysicsextensions_tpv package for sublicensees 2012-07-20 07:38:12 -07:00
Xiaohong Bao afcc61a07a fix for SH-3238: Textures are loaded at lower detail on subsequent log-ins 2012-07-19 15:31:33 -06:00
Nat Goodspeed 2a00ad0751 Move "remember password" checkbox right a few pixels 2012-07-19 14:36:02 -04:00
Nat Goodspeed 27cbfef026 MAINT-1175: Use workaround for comparing std::type_info* on gcc < 4.4.
We now specialize std::less<const std::type_info*> to use
std::type_info::before(), and on Windows and Mac that Just Works. It even
works on Linux when using gcc 4.4+: more recent implementations of gcc's
std::type_info::before() apparently do name()-string comparisons internally.
It doesn't work so well on Linux with gcc 4.1, though, and that's the compiler
we still use on our Linux build-farm machines. But rather than give up,
perform explicit name()-string comparison in that case.
2012-07-19 08:35:11 -04:00
Aura Linden d2e67d0c0b cmake changes for OSX 10.7 2012-07-18 19:01:19 -07:00
Aura Linden 35eda06ae4 llglheader include change for building on Lion 2012-07-18 17:35:10 -07:00
Nat Goodspeed 2e83dfa217 MAINT-1175: Ditch LLTypeInfoLookup, make map<const type_info*> work.
Instead of forbidding std::map<const std::type_info*, ...> outright (which
includes LLRegistry<const std::type_info*, ...> and LLRegistrySingleton<const
std::type_info*, ...>), try to make it work by specializing std::less<const
std::type_info*> to use std::type_info::before().
Make LLRegistryDefaultComparator<T> use std::less<T> so it can capitalize on
that specialization.
2012-07-18 20:33:54 -04:00
Todd Stinson 843db677d1 Setting the description column of the linkset floater to be a fixed width. Having multiple dynamic width columns apparently prevents other columns from being manually resized by the user. 2012-07-18 16:25:05 -07:00
Todd Stinson 856827de23 Updating the build tools floater to better handle multi-line creator and owner names. 2012-07-18 14:12:32 -07:00
Nat Goodspeed 5e1e44ca7e MAINT-1175: merge backout LLRegistrySingleton<std::type_info::name()> 2012-07-18 16:31:22 -04:00
Nat Goodspeed 7f609b6a69 Backed out changeset a25bfa87418d (using std::type_info::name())
The changeset above touched every consumer of the two LLRegistrySingletons
originally defined with std::type_info* as keys. Those two
LLRegistrySingletons were changed to use const char* as keys, then all
consumers were changed to pass std::type_info::name() instead of the plain
std::type_info* pointer -- to deal with the observed fact that on Linux, a
given type might produce different std::type_info* pointers in different load
modules. Since then, Richard turned up the fascinating fact that at least some
implementations of gcc's std::type_info::before() method already accommodate
this peculiarity. It seems worth backing out the (dismayingly pervasive)
change to see if properly using std::type_info::before() as the map comparator
will work just as well, with conceptually simpler source code.
This backout is transitional: we don't expect things to build/run properly
until we've cherry-picked certain other pertinent changes.
2012-07-18 15:51:34 -04:00
Nat Goodspeed f7449bdc57 Make "Log In" button (etc.) move with start/grid combo visibility.
The "Start at:" combo box and the grid-selector box can be turned on and off
with checkboxes on the Preferences floater. Break the bottom-left layout_panel
on panel_login into several different layout_panels so when these UI elements
disappear, other controls move left to fill the holes. Similarly, when you
turn on either or both of the UI elements in question, the remaining controls
in that general bottom-left area move right to accommodate.
Tweak C++ and non-English panel_login.xml overrides to reflect widgets'
containment in new layout_panel elements.
Discard obsolete "mode_selection_text" and "mode_combo" translations from non-
English panel_login.xml overrides.
2012-07-18 14:47:16 -04:00
Oz Linden c3d1ed5b76 merge back fixes from 3.3.4-beta5 2012-07-18 05:52:01 -07:00
Oz Linden 9643dee27e Added tag 3.3.4-beta5 for changeset ab2ffc547c8a 2012-07-18 05:41:55 -07:00
Oz Linden f26dfe4fb9 merge changes for DRTVWR-184 2012-07-18 03:10:25 -04:00
Oz Linden a93cb07df6 tag merge of DRTVWR-184 2012-07-18 03:09:09 -04:00
Todd Stinson 0e592855eb Updating to the latest llphysicsextension source package. 2012-07-17 19:06:35 -07:00
Nat Goodspeed 149598bd57 Reinstate "Need help logging in?" link rather than question-diamond.
Revert to corresponding original login_help text for each affected language.
2012-07-17 16:24:58 -04:00
Nyx (Neal Orman) d2801da16f SH-3258 WIP revert to server-generated textures
After exiting appearance mode, next server-generated appearance message should
over-ride the locally-generated textures.
2012-07-17 14:34:35 -04:00
Dave Parks 636e20be10 MAINT-1223 More aggressive rebuilding of render batches when alpha color values change. 2012-07-17 13:00:33 -05:00
Oz Linden 3803a5b5ae pull back fixes for 3.3.4-beta4 2012-07-17 13:21:36 -04:00
Oz Linden c906d64004 Added tag 3.3.4-beta4 for changeset 6c75f220b103 2012-07-17 13:18:12 -04:00
Don Kjer cff3469d46 Merge viewer-development -> viewer-horde-fixes 2012-07-17 16:52:19 +00:00
Oz Linden e49faf96aa merge changes for DRTVWR-183 2012-07-17 12:16:37 -04:00
Oz Linden 291be17078 tag merge of DRTVWR-183 2012-07-17 12:16:22 -04:00
Nat Goodspeed 5a1cbb1ef6 Use question-mark-in-diamond for help, rather than skull&crossbones. 2012-07-16 21:59:13 -04:00
Nat Goodspeed 55a7bdf8d3 MAINT-1175: Pass boost::unordered_map hash/equals functors for char*.
boost::unordered_map<const char*, ...> does NOT, by default, "do the right
thing." Give it hash and equality functors that do.
2012-07-16 21:05:23 -04:00
Dave Parks e3c5cf99f1 MAINT-1270 Fix for some flexi prims becoming flat at some LoDs 2012-07-16 17:27:52 -05:00
Nyx (Neal Orman) 00b58ad844 Automated merge with https://bitbucket.org/VirLinden/sunshine 2012-07-16 17:29:07 -04:00
Nyx (Neal Orman) 3679631887 SH-3261 WIP Updated texture switching code
Updated texture switching code to use the proper request URL, even if
reverting to a "last known good" baked texture UUID. Viewer should now
switch to a locally-generated composite on entering appearance mode, and
should remain using such until a new appearance message is received.

Still to do: handling adjacent regions with varying support for the new
system, fixing switch back to server-generated bakes.
2012-07-16 17:29:01 -04:00
Dave Parks ccac47c1a7 MAINT-1223 Fix for alpha updates not triggering LoD updates. 2012-07-16 14:31:15 -05:00
prep 02a182867c Path-814: Corrected shader fragment compilation error. 2012-07-16 15:11:23 -04:00
Oz Linden 509408f393 merge back beta fixes for DRTVWR-180 2012-07-14 09:30:09 -04:00
Oz Linden a4df79bcdc tag merge of DRTVWR-180 2012-07-14 08:50:13 -04:00
Xiaohong Bao 833d73d674 fix for SH-3235: Bump maps are not loaded until objects change LOD 2012-07-13 17:46:43 -06:00
Todd Stinson 9128191713 Disabling the phantom toggle when the object is volume-detect. 2012-07-13 15:26:02 -07:00
Brad Payne (Vir Linden) 409be9dcc4 SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates 2012-07-13 16:59:57 -04:00
Nat Goodspeed da69ec0138 Try to adapt non-English panel_login.xml files for Leo's new layout.
en/panel_login.xml had to be changed to enlarge certain fields for other
languages (rather than overriding sizes in each of several other languages).
Still need to translate new create_account_text and verify guessed log_in_text.
2012-07-13 16:20:39 -04:00
simon@Simon-PC.lindenlab.com 7cd5f7d479 Merge from lindenlab/viewmaster so we can get rid of it 2012-07-13 11:10:40 -07:00
Oz Linden c3d9f0e41c merge changes for DRTVWR-179 2012-07-13 13:04:16 -04:00
Oz Linden e51a60536d tag merge of DRTVWR-179 2012-07-13 13:03:50 -04:00
Nat Goodspeed 8356cc1c4f Try reorganizing panel_login.xml per Leo's redesign.
This includes replacing the small "Sign up" link with a "CREATE YOUR ACCOUNT:
Start now" button, requiring a small tweak to the C++ code to Do The Right
Thing when the button (vs. the link) is clicked.
2012-07-13 12:38:26 -04:00
Don Kjer 5a473a42a6 Remove MaxFPS limit during login, teleports, and logout. 2012-07-13 02:54:48 +00:00
Don Kjer 3c9c7036fe Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes 2012-07-13 02:09:57 +00:00
Todd Stinson 5cc36ff228 Cleaning up some runtime output warning messages about invalid XUI syntax. 2012-07-12 18:40:51 -07:00
Xiaohong Bao 0660f646e1 fix for SH-3237: cached sculpties do not load at the correct LOD. 2012-07-12 17:54:38 -06:00
Todd Stinson 6412fba748 Better optimization for loading avatar names that are already cached. 2012-07-12 15:24:56 -07:00