summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed
2013-07-26CHOP-962: merge code-review fixes with viewer-releaseNat Goodspeed
2013-07-26CHOP-962: per code review, comment that other code relies on "Global".Nat Goodspeed
The comment advises grepping for "Global" rather than specifically pointing to llcontrol.cpp because that's NOT the only place that relies on the name "Global"! Besides, by the time someone does want to change the name, still other such dependencies could've crept in.
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25Kill all the vivox logsAura Linden
2013-07-25MAINT-2715 FIX Capabilities request handling not working properly if request ↵PavelK ProductEngine
gets lost
2013-07-30Merge downstream codesimon
2013-07-24added default sourceid and check that sourceid is not blank, hoping to get ↵JJ Linden
the windows builds to recognize the value
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-23CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not ↵Mnikolenko ProductEngine
from group or friend.
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-22Turn off logging.Aura Linden
2013-07-22MAINT-2717 FIX Cannot see kittycorner SLS region from Sunshine regionPavelK ProductEngine
2013-07-19MAINT-2908 : Add RegionAboutToShutdown alert to viewersimon
2013-07-18Slight adjustment to RegionRestartSeconds and RegionRestartMinutes messages tosimon
show region names.
2013-07-17CHOP-962: Make LLControlGroup::declare* return LLControlVariable*Nat Goodspeed
LLControlGroup::declareControl(), declareString() etc. etc. all used to return BOOL -- which no one ever examines because it unconditionally returned TRUE. Make it return the (possibly new) LLControlVariable* instead.
2013-07-16CHOP-966: use 4 part version numbers for release notes urlsOz Linden
2013-07-16CHOP-960: Validate cmd_line.xml for map-to real settings.xml vars.Nat Goodspeed
A small, fixed set of cmd_line.xml switches can't reasonably be mapped to settings variables, mostly because they affect the settings machinery itself. Other than those, every new cmd_line.xml switch should map-to a settings variable. Validate that only the known set does not have map-to; validate that map-to variable actually exists.
2013-07-16MAINT-2386 Update group information before sending invitemaxim@mnikolenko
2013-07-15merge changes for CHOP-963Oz Linden
2013-07-15merge changes for storm-1952Oz Linden
2013-07-13CHOP-963: Add a new --update-service command line argument for QA useOz Linden
2013-07-12MAINT-2875 FIXED Shortcut was changed and menu item was added.maxim@mnikolenko
2013-07-11MAINT-2879 : Viewer should revoke animation permissions with "Stop Animating Me"simon
Reviewed by Kelly
2013-07-11Merged in viewer-releaseAura Linden
2013-07-11CHOP-959: Merge About-box changes with tipNat Goodspeed
2013-07-11CHOP-959: Re-add global coordinates, plus SLURL, to About box.Nat Goodspeed
2013-07-09[MAINT-2386] Viewer crashes when user move landmarks from Inventory -> ↵Baker Linden
Landmarks or Places to Favorite bar Forgot to commit the errant comment -- double whoopsie all the way across the sky!
2013-07-09[MAINT-2386] - Viewer crashes when user move landmarks from Inventory -> ↵Baker Linden
Landmarks or Places to Favorite bar - Pushed to viewer-cat for release.
2013-07-09CHOP-963: Make update service query url depend on the grid rather than settingsOz Linden
2013-07-08STORM-1952: Fix name sometimes appearing as (waiting) by generating a slurl ↵Cinders
instead of fetching a name
2013-07-02Mergesimon
2013-07-02MAINT-2808 Viewer side : Stats for OBJECT_ATTACHMENT_GEOMETRY_BYTES and ↵simon
OBJECT_ATTACHMENT_SURFACE_AREA do not return to the 'no attachments' values after avatar removes last attachment
2013-07-02CHOP-959: Merge region-local location change with tip.Nat Goodspeed
2013-07-02CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.Nat Goodspeed
2013-07-02Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-07-02NORSPEC-290 Disable occlusion culling for distortion render target since ↵Dave Parks
there are generally zero under water occluders.
2013-07-02CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.Nat Goodspeed
Route --url and --slurl command-line switches through a common settings variable. Treat them uniformly now. (Previously, passing --url would notice a grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.)
2013-07-02MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and ↵Maestro Linden
corrected related tooltips
2013-07-02MAINT-1312 Fixed a typo in PRIM_TEMP_ON_REZ tooltip. Reviewed by Kelly.Maestro Linden
2013-07-02MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by ↵Maestro Linden
Kelly.
2013-07-02merge changes for storm-1953Oz Linden
2013-07-02merge changes for STORM-1948Oz Linden
2013-07-02CHOP-959: Report region-local position in Help -> About box.Nat Goodspeed
I've never really understood the usefulness of displaying world-global coordinates in the Help -> About box. It seems to me far more useful to know where you are within the current region. If that proves problematic, we can display both sets of coordinates -- but let's try it this way first.
2013-07-02CHOP-959: add POSITION_LOCAL to LLFloaterAbout::getInfo() blob.Nat Goodspeed
The existing POSITION variable gives "global" position: that is, your region- local coordinates plus the (somewhat arbitrary) global coordinates of the region's corner within the whole world. That may be meaningful to people on the mainland, hard to say, but it correlates with nothing else available from the viewer. POSITION_LOCAL gives you region-local coordinates, which could be used (for instance) to construct a SLURL.
2013-07-01NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, ↵Dave Parks
slight cleanup.