summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2009-11-23mergeMike Antipov
--HG-- branch : product-engine
2009-11-23MergeDmitry Zaporozhan
--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
2009-11-05Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak' ↵Tofu Linden
button which is broken on trunk.
2009-11-05IM: removed unused class and xml file for im p2p control panelIgor Borovkov
--HG-- branch : product-engine
2009-11-04Merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/Steve Bennetts
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-04EXT-2216 : Task properties sidepanelLoren Shih
Subclassing sidepanel item/task info with llsidepanelinventorysubpanel. Some bug fixing and cleanup. --HG-- branch : avatar-pipeline
2009-11-04LLTalkButton -> LLSpeakButton, 'cos that's what it is.Tofu Linden
2009-11-04more splitting of code.Tofu Linden
2009-11-04Implemented normal task EXT-704 "Remove Place Media panel".Sergei Litovchuk
- Removed Place Media panel. This also fixes bug EXT-454 "Place - Media: Gear near 'All nearby media' shoudl be removed according to the latest changes in the spec". --HG-- branch : product-engine
2009-11-04EXT-2216 : Task properties sidepanelLoren Shih
Guts of task properteis sidepanel created. --HG-- branch : avatar-pipeline
2009-11-03EXT-2168 : Rename ObjectInfo to ItemInfoLoren Shih
Renaming for better clarity as to what llsidepaneliteminfo does. Also fixed an error where Edit was not enabling the panel. Also did some superficial cleanup and reorganization of llsidepanel- files. --HG-- branch : avatar-pipeline
2009-11-03Implemented sub-task EXT-1452 '"places" title should not be on thisSergei Litovchuk
panel': - Made LLPlaceInfo a base class for two derived LLPlaceProfile and LLLandmarkInfo classes each representing a separate panel with its own XUI layout. - Fixed broken title change for Place Profile and Landmark cases. --HG-- branch : product-engine
2009-11-03For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]Loren Shih
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
2009-11-02Merge conflict resolution for previous commit.Loren Shih
--HG-- branch : avatar-pipeline
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work.
2009-10-30DEV-41705 - introduce new floater for nearby media based on Brian's designRick Pasetto
2009-10-28rename llpanelmediahud to llpanelprimmediacontrolsRick Pasetto
2009-10-28IM refactoring: moved speakers management stuff in its own files ↵Igor Borovkov
llspeakers.* from dying llfloateractivespeakers. * Decresed number of llfloateractivespeakers.h includes to a minimum. --HG-- branch : product-engine
2009-10-27IM refactoring: moved voice channel related classes to its own ↵Igor Borovkov
llvoicechannel.* files from dying llimpanel.* files --HG-- branch : product-engine
2009-10-22Fixing the build for PE.Mark Palange (Mani)
Now building with llkdu can be skipped by specifying INSTALL_PROPRIETARY=OFF when configuring the build. Reviewed by palmer
2009-10-21mergeSteve Bennetts
2009-10-22Merging revisions 2129-2144 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720 * Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234