summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-09Reduce likelihood of indefinite wait in viewer integration tests.Nat Goodspeed
Introduce LLStartupListener to allow viewerclient-based test script to query startup state. This handles the scenario in which, by the time the test script manages to connect, the viewer already IS in STATE_STARTED. Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make that wait time out eventually to deal with "System currently logging you off, please wait 5 minutes." Timeout raises new ViewerWontLogin exception. Fix testlangs to catch ViewerWontLogin and retry a limited number of times.
2009-12-08 DEV-43897 linux viewer2 corrupted vorbis problemTofu Linden
we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
2009-12-08DEV-43439: Created new LLVersionInfo API.Lynx Linden
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-07Merge from product-engineSteve Bennetts
2009-12-07DEV-43439: Rename llviewerbuild.{cpp|h} -> llviewerversion.{cpp|h}Lynx Linden
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-07DEV-43439: Added calls to query the viewer version.Lynx Linden
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-07DEV-43439: Allow Home side panel URL to be customized.Lynx Linden
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-04Implemented normal priority task EXT-2311 (Filter in side panels should ↵Vadim Savchuk
highlight results). Added missing highlighting to people/group lists and teleport history. Btw, the "none" group list entry now gets hidden when user types a filter. --HG-- branch : product-engine
2009-11-13Added a USE_PRECOMPILED_HEADER cmake variable (defaulted on) and disabled ↵brad kittenbrink
pch usage for test executables. Reviewed by james and steve.
2009-12-02DEV-43439: Initial web-based Home side tray panelLynx Linden
Moved LLSideTrayInfoPanel from llsidetray.cpp into its own llpanelhome.{cpp|h} module. Updated the XUI for the Home tab to simply embed a web view. Thanks to Erica for the initial cut at this XUI.
2009-12-01mergeJames Cook
2009-11-30merge.Tofu Linden
2009-11-28implemented EXT-2889 "Incoming "grant modify rights" message should triggerAlexei Arabadji
notify toast and adding record to IM history"; fixed avatar icon in IM-floater when message added to IM-session; avoided popup of IM-tast when message added to IM-session; --HG-- branch : product-engine
2009-11-27Add CMake var LL_TESTS to optionally disable tests for build timingJames Cook
2009-11-25Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) ↵Mike Antipov
started by Lynx (LLVoiceControlPanel)) -- added new files to CMakeLists --HG-- branch : product-engine
2009-11-25merge from trunk.Tofu Linden
2009-11-24mergeVadim Savchuk
--HG-- branch : product-engine
2009-11-24merge.Tofu Linden
2009-11-23mergeMike Antipov
--HG-- branch : product-engine
2009-11-23bones.Tofu Linden
2009-11-23MergeDmitry Zaporozhan
--HG-- branch : product-engine
2009-11-20Renamed classes and files for "Me" task panel for better readability.Vadim Savchuk
Renamed files: - indra/newview/llpanelmeprofile.{cpp,h} to llpanelme.{cpp,h} - panel_me_profile.xml to panel_me.xml - panel_profile_user.xml to panel_my_profile.xml Renamed classes: - LLPanelAvatarMeProfile to LLPanelMyProfile - LLPanelMeProfile to LLPanelMe - LLPanelMeProfileEdit to LLPanelMyProfileEdit --HG-- branch : product-engine
2009-11-20Merging heads, hmm.Tofu Linden
2009-11-20EXT-2618 Added code to determine if the viewer is running 'compatibility mode'Mark Palange (Mani)
OS version string reports compatibility mode and real os version number, if accessible. reviewed by Richard
2009-11-20Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked ↵Dmitry Zaporozhan
up to LLDialog chiclets. Implemented LLDialog(LLScriptFloater) and Script Chiclets. --HG-- branch : product-engine
2009-11-20Work on normal task EXT-2640 (Create a tabbed IM multifloater)Mike Antipov
- initial commit: added xml file and base implementation of the tabbed IM multifloater --HG-- branch : product-engine
2009-11-17Sidepanel Appearance refactoring. Work in progress.Loren Shih
1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance) 2. Changed some "Looks" names to "Outfits" 3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming) 4. Took out tab from sidepanel_appearance. --HG-- branch : avatar-pipeline
2009-11-13Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-12Rename LLInventoryObservers to LLInventoryObserverLoren Shih
2009-11-12Extracted LLInventoryObserver classes from LLInventoryModel.h into their own ↵Loren Shih
subclass, LLInventoryObservers.h. This reduces dependencies and compile times, and makes these classes easier to locate. I have not yet refactored classes to remove #include "llinventorymodel.h" and replace with #include "llinventoryobservers.h". This will happen later.
2009-11-12Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-12mergeangela
2009-11-12make color and font affecting both nearby chat and toastsangela
2009-11-12mergeLynx Linden
2009-11-12DEV-2925: Added a new remote object inspector.Lynx Linden
This is used to display details about objects that may not be in the current scene (the existing object inspector is tied to selection and only works for objects in the scene). The remote inspector lets you see the name and owner of the object. You can also teleport to the object's location, view the location on the map, or mute the object. I've also added more information to the notification you receive when an object sends you an IM via llInstantMessage(). This notification now has an "Inspect" button that brings up the remote object inspector.
2009-11-11Changing VC Debugger working directory to be ${CMAKE_CURRENT_SOURCE_DIR} to ↵brad kittenbrink
restore ability to edit in place xui files, shaders, etc.
2009-11-09Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0.brad kittenbrink
2009-11-09randgauss.h isn't *really* used by the viewer - remove #include and move it ↵Tofu Linden
to llmath with ll-header naming convention.
2009-11-06mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-06Automated merge with http://hg.lindenlab.com/viewer/viewer-2-0Mark Palange (Mani)
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-05merge to viewer-2-0palange
2009-11-05Merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/Steve Bennetts
2009-11-05mergeMark Palange (Mani)
2009-11-05Added calls to ll_deploy_sharedlibs_commandMark Palange (Mani)
Using viewer_manifest.py for windows dependency deployment during build. Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-11-05Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-11-05partly impemented EXT-700 '"Offer" notifications should be accessible via ↵Alexei Arabadji
chiclet' --HG-- branch : product-engine
2009-11-05mergeVadim Savchuk
--HG-- branch : product-engine