summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2010-11-15Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-13STORM-52 FIXED Made it possible to use an external script editor.Vadim ProductEngine
The editor can be specified: * via "ExternalEditor" setting in settings.xml * via LL_SCRIPT_EDITOR variable Removed obsolete XUIEditor setting in favor of the new one.
2010-10-22Merge with viewer-developmentMerov Linden
2010-10-21Merge with andrewKyle Ambroff
2010-10-12Pull update from viewer-developmentMerov Linden
2010-10-11Another merge from http://hg.secondlife.com/viewer-developmentAndrew Meadows
2010-10-15automated mergeRoxie Linden
2010-10-15MergeLeyla Farazha
2010-10-15automated mergeRoxie Linden
2010-10-15automated mergeRoxie Linden
2010-10-15Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-10-13automated mergeRoxie Linden
2010-10-12EVE-47 - Event formatting should appear in "Profile" windowRoxie Linden
EVE-74 - Change in-viewer support for 'notify me' to be maintainable via app slurl EVE-72 - Modify viewer to make the event profile window be an html control This is basically a reworking of the event profile display to remove all in-viewer specific event display rendering, in preparation for richtext descriptions. Most was removal of code.
2010-10-08Created a floater for setting display nameLeyla Farazha
2010-10-02STORM-137 : Build script modif so that Windows build does not rely on ↵Merov Linden
fmod.dll being dropped in the source tree + addition to allow fmod to be found in standalone. Caution: wait an upcoming install.xml commit before pulling if building internaly.
2010-09-27MergeLeyla Farazha
2010-09-16Pull update from viewer-developmentMerov Linden
2010-09-16MergeLeyla Farazha
2010-09-15STORM-181 : add featuretable_xp to the list of files to install for WindowsMerov Linden
2010-09-13Merge with http://hg.secondlife.com/viewer-development after migrationAndrew Meadows
of Brad's simconsole work.
2010-09-10Post-convert merge by convert_monolith.py from ↵Andrew Meadows
http://hg.lindenlab.com/brad/viewer-simconsole
2010-09-10Pull from lindenlab/viewer-developmentMerov Linden
2010-09-10merge storm-93Tofu Linden
2010-09-10STORM-93 FIXED Added Take Off function to the gear menu and implemented this ↵Paul Guslisty
functionality using helper methods: canTakeOffSelected() - checking whether selected item(s) can be taken off hasItemSelected() - checking whether any item selected getSelectedItemsUUIDs() - returns selected items ids
2010-09-10merge the latest ECC/Shining sprint work. ↵Tofu Linden
http://bitbucket.org/seraph/viewer-development-shining
2010-09-08VWR-22761 : Rearchitecture of llmetricperformancetester and simple (non ↵Merov Linden
complete) implementation in llimagej2c
2010-09-08VWR-22891 FIXED Fixed inability to share an item while My Inventory SP is ↵Vadim Savchuk
undocked. All detached side tray tabs are now wrapped with LLFloaterSideTrayTab that adds them as exceptions to LLTransientFloaterMgr, i.e. as views clicking on which doesn't hide transient floaters.
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-09-01VWR-22759 : port of SNOW-667, Automatic language translation of chat messagesMerov Linden
2010-09-01VWR-22695 FIXED Adding attachments messaging is inefficientLoren Shih
Single attachment request are now batched up and sent all at once as a single message.
2010-09-22mergeRichard Linden
2010-09-16mergeRichard Linden
2010-09-16STORM-122 FIXED Clean up obsolete floaters and related dead codeAimee Linden
Removed obsolete XUI files: floater_activeim.xml floater_customize.xml floater_device_settings.xml floater_first_time_tip.xml floater_im.xml floater_my_friends.xml floater_outfit_save_as.xml floater_preview_classified.xml floater_preview_event.xml floater_preview_gesture_info.xml floater_preview_gesture_shortcut.xml floater_preview_gesture_steps.xml floater_statistics.xml floater_wearable_save_as.xml panel_audio_device.xml panel_friends.xml panel_groups.xml panel_nearby_chat.xml panel_online_status.xml panel_region_general_layout.xml Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files.
2010-09-16refactored notification template into own header fileRichard Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-26re-merge viewer-public. has a rough edge or two, but this is closer to the ↵Tofu Linden
snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
2010-08-24Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dllMerov Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-20VWR-20847 (SNOW-543/SNOW-517) FIXED Linux packaging fixes.Aimee Linden
2010-08-12first pass at hintsRichard Nelson
2010-08-11cleaned up LLFirstUse and added ignorable_dialogs to project xmlRichard Nelson
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-19Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and ↵Aimee Linden
LLPanelPlace Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
2010-07-07Merged from viewer-releaseDessie Linden
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-07-06Merged from viewer-release after resolving conflictsDessie Linden