Commit Graph

108 Commits (824a1b359ef84b2d0962de6dc74e5cfcbe2f144a)

Author SHA1 Message Date
Ansariel d58d2e2c20 Consolidate check for standalone place details floater into FSFloaterPlaceDetails 2016-02-04 11:41:57 +01:00
Nicky 40c5ed2f0e Fix merge error. 2015-05-05 18:11:41 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02: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
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
AndreyL ProductEngine 507280d4c8 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
Ansariel 4408b5aef9 Backed out changeset: e7b5cfccef68 - Make room for official crash fix from Linden Lab 2014-05-11 11:52:16 +02:00
ziree 48a0a7db52 Fix notecard crasher with invalid embedded asset type. FIRE-13558 2014-04-25 15:01:47 +02:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -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
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07: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
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Ansariel 1262f40356 FIRE-816/FIRE-817: Some experimental UI improvements 2012-12-03 11:06:14 +01:00
Kitty Barnett fe6ffb1d18 FIRE-8356: Embedded notecards are silently copied to inventory rather than opened when 'ShowNewInventory' is set to TRUE 2012-07-02 00:29:51 +02:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07: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
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01: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
Selo 57090ae504 FIRE-1599 Add textsearch to Notecards, patch submitted by Satomi Ahn and Kitty Barnett 2011-09-15 21:08:45 +02: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