Commit Graph

4203 Commits (7a7eced4a619d98d808abba3f0bf951bcf4cd95a)

Author SHA1 Message Date
Palmer 7a7eced4a6 Fix of last merge borkasaur. Left off a comma on defining the mesh array. Also switched our mesh icon code to sync with viewer 2 and cleared out extra notification 2009-12-08 16:06:18 -08:00
Palmer 74f2cb2a70 Grabbed more viewer 2 changes that should fix parabuild problem 2009-12-08 10:00:32 -08:00
Tofu Linden e07ef0d0e0 merge. 2009-12-08 08:57:02 +00:00
Lynx Linden 0c607a6b88 DEV-43679: Pass god mode through to search.
The state of gAgent.isGodlike() is now passed through to the Search
web pages via a new g=[0|1] query parameter.
2009-12-08 15:16:04 +00:00
Lynx Linden 98111a40ec DEV-43439: Created new LLVersionInfo API.
Renamed llviewerversion to llversioninfo, to avoid confusion with
llversionviewer in llcommon (llversion is already used by llwindow).

Created new LLVersionInfo class with the following methods:

        static S32 getMajor();
        static S32 getMinor();
        static S32 getPatch();
        static S32 getBuild();
        static const std::string &getVersion();
        static const std::string &getShortVersion();
        static const std::string &getChannel();

All viewer code has been updated to use this API. Viewer code no
longer directly includes llversionviewer.h from llcommon.
2009-12-08 14:56:19 +00:00
Lynx Linden 06429722ac EXT-2350: Added a help link to login panel.
There is now a new "Need help logging in?" link on the right-hand side
of the login panel. Clicking on this brings up the help browser with
the pre_login_help topic (the same as pressing F1).
2009-12-08 12:20:22 +00:00
Lynx Linden b133ed1ae0 EXT-2427: Added an About > Report Bug menu
This menu brings up the Help Browser with the report_bug topic.

To support this, I've created a new ShowHelp function that can be
accessed from XUI. You can supply an optional help topic parameter,
or if you specify no parameter then the default (F1) help is shown.
2009-12-08 11:22:45 +00:00
Lynx Linden 5776926807 DEV-43439: Added support for GRID substitution variable.
The Home side panel URL, specified in settings.xml, now additionally
supports a [GRID] substitution variable, with potential values equal
to: "None", "Agni", "Aditi", etc.
2009-12-08 10:51:33 +00:00
Lynx Linden da2a0385ae DEV-43439: Remove Back/Forward/Home buttons from Home side panel.
As per request from Yoz. They will add navigation buttons to the
actual HTML content.
2009-12-08 10:28:45 +00:00
Lynx Linden 5df04533f6 DEV-41358: Updated the Search URL to the new staging area. 2009-12-08 10:17:41 +00:00
Tofu Linden 432bf69ad6 DEV-43897 linux viewer2 corrupted vorbis problem
we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
2009-12-08 08:56:13 +00:00
Palmer Truelson cd138869d5 fix of another merge borkasaurus 2009-12-07 17:38:45 -08:00
Ramzi Linden 6301211b7c EXT-2855 delete 2 more entries in strings.xml that are not actually user-visible 2009-12-07 17:28:39 -08:00
Steve Bennetts 5c2686bc63 Merge 2009-12-07 17:09:19 -08:00
Steve Bennetts 5245fb6972 merge fixes 2009-12-07 17:07:52 -08:00
Palmer 1590f187cf Fixing merge borkasaurs. 2009-12-07 16:58:05 -08:00
Ramzi Linden b65334a4c1 L10N: Add much-needed linguistic context in the comments of strings.xml;
L10N: consistency in phrasing on the 2 separate places in the Nav Bar where you create/edit a Landmark
Also, add a separator to menu_NavBar so its easier to parse visually.
2009-12-07 16:25:08 -08:00
Palmer 85488f5414 Merge of viewer 2 changes 2009-12-07 16:03:56 -08:00
Steve Bennetts 0b4b03fe3e Merge from product-engine 2009-12-07 15:57:31 -08:00
brad kittenbrink 724cbb8134 Made viewerclient.py a bit more robust against timing problems on startup.
It now successfully retries to connect on windows.
reviewed by nat.
2009-12-07 14:37:27 -08:00
Eugene Mutavchi c3a82913de Fixed normal bug EXT-3018([BSI] Hook up "Go to My Dashboard" in Profile to link to http://secondlife.com/my)
--HG--
branch : product-engine
2009-12-07 22:44:44 +02:00
Lynx Linden 374aa101ab Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-12-07 20:36:51 +00:00
Lynx Linden 24cba353a4 DEV-43439: Rename llviewerbuild.{cpp|h} -> llviewerversion.{cpp|h}
This module now contains general viewer version routines, not just
access to the viewer build number, so I've renamed it from
llviewerbuild to llviewerversion.
2009-12-07 20:30:29 +00:00
Lynx Linden de2f8212f0 DEV-43439: Added calls to query the viewer version.
Rather than copy/paste the same version string formatting pattern
again, I added new string-based version routines:

/// return the full viewer version as a string like "2.0.0.200030"
const std::string &llGetViewerVersion();

/// return the viewer version as a string like "2.0.0"
const std::string &llGetViewerShortVersion();

/// return the viewer build version as a string, e.g., "200130"
const std::string &llGetViewerBuildVersion();
2009-12-07 20:05:52 +00:00
Eugene Mutavchi 4a8733fadd No ticket. Removed inventory offer fake notification.
--HG--
branch : product-engine
2009-12-07 22:04:02 +02:00
Eugene Mutavchi eebbf52e5e Implemented normal sub-task EXT-3142("new message" indicator for object chiclets)
--HG--
branch : product-engine
2009-12-07 21:05:18 +02:00
Loren Shih ee159d8e74 automated merge viewer2.0->viewer2.0 2009-12-07 13:50:30 -05:00
Sergei Litovchuk 86c686e962 Fix for major bug EXT-3135 "Crash after dragging LM from 'Inventory' accordion to fav bar".
- Added method to get currently active tab in sidetray.
- Disabled opening sidetray inventory panel upon receiving new inventory item or after drag-n-drop operations with landmarks in sidetray places panel.

--HG--
branch : product-engine
2009-12-07 20:31:45 +02:00
Lynx Linden 37c7e4059c DEV-43439: Allow Home side panel URL to be customized.
The URL for the Home side panel is now specified via a new
"HomeSidePanelURL" string in app_settings/settings.xml. This
string supports the following substitutions:

CHANNEL = the channel name for the viewer
VERSION = the full version string for the viewer
LANGUAGE = the current language set in the viewer
AUTH_KEY = the authentication key (see below)

The authentication key is an optional string that is read from the
dictionary of strings returned by login.cgi. If login.cgi returns a
key called "home_sidetray_token", then the value of that key is used
for the AUTH_KEY substitution. This lets the server provide a piece of
blind data that can be passed to the Home panel web page to support
authentication. The viewer does not interpret the token in any way.

This change adds a new module, llviewerhome.{cpp|h} to contain the
model functionality, used by the view module, llpanelhome.{cpp|h}.
2009-12-07 18:22:52 +00:00
Loren Shih 83fbe4a631 automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
2009-12-07 13:08:14 -05:00
Loren Shih ff7f3c348d EXT-3124 : Add lookup for finding all linked items to an item
Commented this feature out since the viewer can't ask the server to change assetIDs of its inventory items.

--HG--
branch : avatar-pipeline
2009-12-07 13:06:24 -05:00
Denis Serdjuk da8de2b674 implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
Changes:
1.highlighting of landmarks was broken by  LLInventoryPanel::getActiveInventoryPanel().
2. escaping of urls

--HG--
branch : product-engine
2009-12-07 19:42:11 +02:00
skolb 3ddd6ad286 Merge viewer 2.0 into media 2009-12-07 09:37:54 -08:00
Igor Borovkov 0a88e412cc tast EXT-3096 (Notification toasts mouse hovering behavior), fade behavior is now being reset for all toasts on hovering
--HG--
branch : product-engine
2009-12-07 19:09:25 +02:00
Loren Shih 13f1ed2740 EXT-3124 : Add lookup for finding all linked items to an item
EXT-3195 : Regenerat Links sometimes pairs to library items

Excluding library when repairing broken links.
Reselecting original selected broken link after repairing.

--HG--
branch : avatar-pipeline
2009-12-07 11:43:24 -05:00
Mike Antipov 4a1bb89faf Completed normal task EXT-3148 (Implement updating of the IM Well message counter).
-- added broken constants' initialization (in Changeset: f0931dcb0481)

--HG--
branch : product-engine
2009-12-07 18:11:33 +02:00
Paul Guslisty 8cd690bc1f Fixed normal bug EXT - 3074 (Resident name tabs in IM window should not be capitalized)
--HG--
branch : product-engine
2009-12-07 18:03:43 +02:00
Yuri Chebotarev d252d1d57d merge
--HG--
branch : product-engine
2009-12-07 17:02:54 +02:00
Yuri Chebotarev 48803059de EXT-2989 Chiclet overlaps the voice indicator of another chiclet
see comments for details

--HG--
branch : product-engine
2009-12-07 17:01:07 +02:00
Vadim Savchuk 986307972c merge
--HG--
branch : product-engine
2009-12-07 16:49:54 +02:00
Sergei Litovchuk 62dce8b425 Fix for critical bug EXT-3166 "MyInventory/Library Places accordions are causing massive inventory background fetch on startup"
- MyInventory/Library Places accordions aren't expanded on startup now.

--HG--
branch : product-engine
2009-12-07 16:45:14 +02:00
Vadim Savchuk a2434a3a41 Merge from default branch.
--HG--
branch : product-engine
2009-12-07 16:31:14 +02:00
Vadim Savchuk 01447fb0d1 merge
--HG--
branch : product-engine
2009-12-07 16:30:03 +02:00
Lynx Linden 1db39c97a5 EXT-3189: Fix tab order and location of Grid pulldown.
The (optional) Grid pulldown on the login screen is now located below
the Starting Location pulldown, rather than below the Last Name text
entry field. The tab order is also now more obvious.
2009-12-07 14:25:21 +00:00
Vadim Savchuk 7c839098a7 Minor comments cleanup.
--HG--
branch : product-engine
2009-12-07 16:18:24 +02:00
Vadim Savchuk 4dc667b83f merge
--HG--
branch : product-engine
2009-12-07 16:17:42 +02:00
Vadim Savchuk dc6ce7f782 Manual merge from default branch.
--HG--
branch : product-engine
2009-12-07 16:04:24 +02:00
Mike Antipov d5bc38ae2d Work on normal task EXT-3148 (Implement updating of the IM Well message counter). Fixed Linux build
-- move constats into class

--HG--
branch : product-engine
2009-12-07 15:59:49 +02:00
Andrew Dyukov 13dd7431a3 Implemented normal task EXT-3084 (Update Notifications window behavior).
- Added hiding window when focus is lost.

--HG--
branch : product-engine
2009-12-07 15:44:44 +02:00
Lynx Linden fefb08eef5 DEV-43799: Make the search web view be 650x600. 2009-12-07 13:21:42 +00:00