Commit Graph

94 Commits (b6e7708d608ee045a204758b2c259da1d4e826cc)

Author SHA1 Message Date
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
andreykproductengine c73d9e5c44 MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0 2015-12-29 20:20:40 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
AndreyL ProductEngine 403d569adc MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 based viewer when opened.
Correct fix after testing.
2014-05-09 05:15:54 +03:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
MaximB ProductEngine e71e30aea0 MAINT-3174 (When resident is sharing some item with you, there is no context menu in IM conversation.) 2013-10-01 11:06:44 +03:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
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-07-30 19:13:45 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
maxim_productengine 67750daf23 MAINT-836 FIXED Set title and description for Preview Texture floater if it's called from link in notecard 2012-08-23 12:35:10 +03:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Leslie Linden 94678c2f7f EXP-1541 update -- Route inventory items sent in a Notecard to correct 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-11-04 11:26:50 -07:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine 0cd1988ef7 EXP-1223 FIXED (Create and register a floater for Places side tab)
- Added xml for a new floater and registred it in the floaterreg

- Removed side tray dependencies

- Added static helper method: LLFloaterSidePanelContainer::showPanel
2011-09-22 14:41:44 +03:00
Loren Shih 0278321345 SH-741 FIXED Mesh assets cannot be dragged into notecards
Added DAD_MESH to list of text editor -allowed drag and drop types.
Minor tab reformatting.
2011-01-05 15:08:50 -05:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Matthew Breindel (Falcon) 569f3f4b06 Merge 2010-09-22 13:04:53 -07:00
Dave Parks cf09d6c58a Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater. 2010-09-22 03:04:21 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Dave Parks 2f012dd34f merge 2010-08-25 14:48:18 -05:00
Mike Antipov f6c08d4510 EXT-8459 FIXED preventing crashes: 1) ensure that pointer to inventory item 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-07-22 12:46:57 +03:00
Dave Parks f9b13d8f85 Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes. 2010-06-10 00:45:48 -05:00
Tofu Linden 1dade05ee7 YET another hairy merge from viewer-trunk. Conflicts resolved... so far. 2010-04-06 16:10:16 +01:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
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-04-05 15:02:36 -04:00
Dave Parks 8424ceb20f merge 2010-03-20 16:59:41 -05:00
Dmitry Zaporozhan 00c4dabc2b Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in 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-03-18 17:32:44 +02:00
Tofu Linden a171848fd4 merge from viewer2. 2010-02-03 16:08:44 +00:00
richard 947398563e merge 2010-01-22 17:40:28 -08:00
richard 337716d946 LLPointer cleanup and fix for EXT-4413
reviewed by Rick
2010-01-22 16:51:13 -08:00
Tofu Linden a65188d85f Merge from viewer2. Minor conflict resolved. 2010-01-20 13:54:34 -08:00
Ychebotarev ProductEngine f28778b8b8 work on EXT-4322 Remove the Communicate floater
leave some LLFloaterChat usages commented for later review...

--HG--
branch : product-engine
2010-01-18 17:50:19 +02:00
Dave Parks 6aa71844a8 Merge with viewer-2-0 2009-12-18 13:24:29 -06:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
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 85488f5414 Merge of viewer 2 changes 2009-12-07 16:03:56 -08:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 0e351bedb6 Removed llnotifications.h from all headers by adding llnotificationsptr.h
Fixed many more includes
2009-11-24 22:55:56 -08:00
Palmer 6f3536d597 Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info 2009-11-11 15:16:49 -08:00
richard 723a86f608 fixed layout of items embedded in notecards 2009-11-04 19:00:40 -08:00
richard 83fb99a9ac ext-2038 - script editor, cursor becomes stuck in some rows
ext-2037 0 Script editor, garbage characters inserted in text
2009-11-04 18:28:45 -08:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Palmer b81feb6ae7 Merge of viewer-2-0 changes 2009-11-02 14:16:08 -08:00
David Parks 3e80fa3dbc Sync up with render-pipeline-7 ignore-dead-branch 2009-11-02 19:55:37 +00:00
Denis Serdjuk 97a0108125 fixed bug EXT-1768 Unable to store landmark attached to notecard into Landmarks
--HG--
branch : product-engine
2009-10-29 14:09:31 +02:00
Richard Nelson ce5a5f84d5 ext-1670 - fix the chat history use of widgets
reviewed by leyla
2009-10-20 00:41:41 +00:00
Leyla Farazha 18f1895bf2 EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatar
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-10 00:43:39 +00:00