summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexteditor.cpp
AgeCommit message (Collapse)Author
2014-10-20Update to build on Xcode 6.0: Large (and final) collection of fixes for ↵callum_linden
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-05-09MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 ↵AndreyL ProductEngine
based viewer when opened. Correct fix after testing.
2014-03-12merge with releaseRichard Linden
2013-10-01MAINT-3174 (When resident is sharing some item with you, there is no context ↵MaximB ProductEngine
menu in IM conversation.)
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-08-23MAINT-836 FIXED Set title and description for Preview Texture floater if ↵maxim_productengine
it's called from link in notecard
2012-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2011-11-04EXP-1541 update -- Route inventory items sent in a Notecard to correct ↵Leslie Linden
locations rather than auto-sorting by asset type * New code specifies explicit destination for "copy from notecard" or null, indicating the sim should determine the placement. Reviewed by Stone.
2011-09-29EXP-1209 FIXED Sidetray removed.Paul ProductEngine
- Removed all sidetray dependencies and the sidetray itself. - Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-22EXP-1223 FIXED (Create and register a floater for Places side tab)Paul ProductEngine
- Added xml for a new floater and registred it in the floaterreg - Removed side tray dependencies - Added static helper method: LLFloaterSidePanelContainer::showPanel
2011-01-05SH-741 FIXED Mesh assets cannot be dragged into notecardsLoren Shih
Added DAD_MESH to list of text editor -allowed drag and drop types. Minor tab reformatting.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-22MergeMatthew Breindel (Falcon)
2010-09-22Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching ↵Dave Parks
type back into tools floater.
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-25mergeDave Parks
2010-07-22EXT-8459 FIXED preventing crashes: 1) ensure that pointer to inventory item ↵Mike Antipov
is still valid when landmark is loaded from notecard and 2) adding a check for region capability There are two reasons of the crash reported in the bug: * absence of the "CopyInventoryFromNotecard" capability in region (which leads to crash while logging of a LL_ERRS) * referencing to an invalid pointer to LLInventoryItem in callback. The first issue is fixed by preventing sending of the "CopyInventoryFromNotecard" message if it is not supported (in the "copy_inventory_from_notecard()") The second issue caused by such reason: * Notecard stores LLPointer to each embedded inventory item * When Landmark is clicked it should be opened in Places Panel and inventory item should copied into agent inventory * If it is unknown to agent it is requested and pointer (but not LLPointer!) to inventory item was bound to an appropriate callback * Then when landmark is loaded that inventory item is copied to inventory. * If notecard was closed before callback was trigged all instances to embedded inventory items were destroyed. This leads to crash when trigged callback tries to reference to bound pointer to inventory item (for landmarks) Fix is to pass LLPointer instead of pointer to inventory item into callback to ensure item is valid when it is needed. Details: * updated LLEmbeddedItems::getEmbeddedItem() to return LLPointer to inventory item (and renamed to getEmbeddedItemPtr) * updated LLViewerTextEditor::openEmbeddedItem() to get LLPointer to inventory item * updated LLViewerTextEditor::openEmbeddedLandmark() to get LLPointer to inventory item Patch also contains some more places where pointer is replaced with LLPointer to be consistent. NOTE: there are several LLViewerTextEditor::openEmbeddedXXX() methods which still get pointer to inventory item. It is safe for now because they use it synchronously. I have added a note at their declaration. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/784/ --HG-- branch : product-engine
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-03-20mergeDave Parks
2010-03-18Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in ↵Dmitry Zaporozhan
inventory. Added new icon for multi-objects. New icon is used in inventory, object inventory and buy floater. New icon can not be used in Group Notices because server does not send enough info in GroupNoticesListReply. --HG-- branch : product-engine
2010-02-03merge from viewer2.Tofu Linden
2010-01-22mergerichard
2010-01-22LLPointer cleanup and fix for EXT-4413richard
reviewed by Rick
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-18work on EXT-4322 Remove the Communicate floaterYchebotarev ProductEngine
leave some LLFloaterChat usages commented for later review... --HG-- branch : product-engine
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
--HG-- branch : product-engine
2009-12-08Fix of last merge borkasaur. Left off a comma on defining the mesh array. ↵Palmer
Also switched our mesh icon code to sync with viewer 2 and cleared out extra notification
2009-12-07Merge of viewer 2 changesPalmer
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed llnotifications.h from all headers by adding llnotificationsptr.hJames Cook
Fixed many more includes
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-04fixed layout of items embedded in notecardsrichard
2009-11-04ext-2038 - script editor, cursor becomes stuck in some rowsrichard
ext-2037 0 Script editor, garbage characters inserted in text
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-29fixed bug EXT-1768 Unable to store landmark attached to notecard into LandmarksDenis Serdjuk
--HG-- branch : product-engine
2009-10-20ext-1670 - fix the chat history use of widgetsRichard Nelson
reviewed by leyla
2009-10-10EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatarLeyla Farazha
EXT-1021 Update code to use new Inventory Icon art files in floater_invetory.xml EXT-176 Open and closed state for art for folders in list view in side panel
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-04Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) intoMartin Reddy
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls in text editors and textboxes, with right-click context menus, tooltips, and alternate link labels. This includes alert boxes, the login progress window, local chat and IM interfaces, etc. As well as context menus for avatars and groups in list widgets. Includes fixes for the following individual JIRAs: DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)! DEV-38829 EXT-742: Remove LLLink class DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw DEV-10353: URLs in chat log terminated incorrectly when newline in chat DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs DEV-36192: Need a way to copy Avatar names and Group names DEV-2926: Allow viewer hyperlinks to have different text than the actual url DEV-27253: Add easy way to copy URLs from viewer chat DEV-38274: Make About Second Life window use new Url hyperlinking features DEV-39076: No url support in Text Editors DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access DEV-7475: Add hyperlinks to notecards! DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click Master JIRA issues: DEV-32819, DEV-323820, DEV-7474 Testing performed against QAR-1789 svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3 svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3