Merov Linden
d631f2fd4d
Pull merge from lindenlab/viewer-tools-update (includes viewer-release)
2015-04-14 13:46:01 -07:00
Ansariel
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
Brad Payne (Vir Linden)
32940ee90b
merge
2015-04-13 17:19:27 -04:00
Oz Linden
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
Merov Linden
9ba10bf1f2
Merge lindenlab/viewer-tools-update
2015-03-16 09:49:57 -07:00
Brad Payne (Vir Linden)
dd7f0e2954
MAINT-4980 WIP - moved canAddWearables() to LLAppearanceMgr
2015-03-13 16:55:19 -04:00
Brad Payne (Vir Linden)
fb072c9148
MAINT-4980 WIP - add context menu filtering based on the selection group
2015-03-13 16:38:23 -04:00
Brad Payne (Vir Linden)
64511ce28f
SL-103 WIP - comment
2015-03-06 16:05:47 -05:00
Brad Payne (Vir Linden)
d44e5b7d9c
SL-103 WIP - comment re: possible future work
2015-03-06 15:57:11 -05:00
callum_linden
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
andreykproductengine
c0ae1fe956
MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected
2014-11-10 17:20:03 +02:00
Ansariel
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
Ansariel
a1fd8230bf
Merge LL V3.7.12
2015-01-12 17:56:50 +01:00
andreykproductengine
0ab5b90e4b
MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected
2014-10-30 19:02:06 +02:00
Ansariel
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
callum_linden
7359e9300a
Update to build on Xcode 6.0: collection of removal of unused const variables [-Wunused-const-variable]
2014-10-17 16:52:32 -07:00
Merov Linden
4b80a5ed05
Pull merge from lindenlab/viewer-release
2014-09-28 21:40:32 -07:00
Merov Linden
87a7eee21d
Sync merge with lindenlab/viewer-release
2014-07-22 15:54:53 -07:00
simon
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
simon
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
Merov Linden
9c792f03b4
Pull merge from lindenlab/viewer-release
2014-06-17 09:50:48 -07:00
Merov Linden
252ad06b7b
DD-84 : Final clean up for this fix
2014-06-04 09:58:11 -07:00
Merov Linden
86d75052f6
DD-84 : Fix all active listing modification actions. Add specific message when listing will unlist. Make update skip consistency check when called from internal level (not public API).
2014-06-03 19:46:33 -07:00
Stinson Linden
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
Brad Payne (Vir Linden)
67051b26ba
merge
2014-05-19 18:10:45 -04:00
Stinson Linden
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
andreykproductengine
ef26fdca3d
MAINT-4072 FIXED Searching object content by typing letters no longer works for non-capitalised names.
2014-05-27 18:56:15 +03:00
Brad Payne (Vir Linden)
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
Stinson Linden
b34cdbaa69
MAINT-4009: Patching a minor leak for when the status text box for the folder view has not been reparented.
2014-05-12 23:43:36 +01:00
simon
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
simon
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
Stinson Linden
001621dfc2
MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
2014-05-05 23:24:34 +01:00
Xiaohong Bao
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
Brad Payne (Vir Linden)
d0eb9658f2
merge
2014-04-22 11:19:58 -04:00
simon
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
simon
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
Tank_Master
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Tank_Master
e3ea0378b6
Merge LL 3.7.6
2014-05-17 11:18:52 -07:00
Mnikolenko ProductEngine
6585027996
fix build problem
2014-03-05 12:25:52 +02:00
andreykproductengine
7a45e6fd77
MAINT-358 FIXED [PUBLIC]Verbs buttons are available for landmarks folder if it was selected via keyboard
2014-02-28 15:33:09 +02:00
Kitty Barnett
03319c629b
[BUG-4617] Renaming an inventory folder can result in a different folder being moved inside another folder
...
-> after renaming folder 3 it will actually sort at the top, moving folder 2 to the bottom position
-> when processing the left-click (onMouseDown) the items will be in their original order and the position saved is in local coordinates
-> when processing the hover (onMouseHover) the items will have rearranged and even though the mouse hasn't moved, the item has moved
=> result is that since the item moved (relative to the stationary mouse) the viewer interprets it as a drag-and-drop operation
2014-02-04 23:19:36 +01:00
Mnikolenko ProductEngine
c243578337
MAINT-3520 FIXED Сall arrange(NULL, NULL) to avoid occasional drag'n'drop folders after renaming.
2014-01-08 12:34:35 +02:00
Richard Linden
813bc232e7
MAINT-3017 FIX Inventory filter for Recent tab does not persist between sessions as it used to.
...
added names back to inventory filters, so they can be deserialized
2013-12-09 15:42:51 -08:00
Brad Payne (Vir Linden)
8f4c4db90f
SH-4611 FIX - use an observer to scroll after category rename completes
2013-11-23 09:37:09 -05:00
merov
c16de4df18
ACME-1219 : Fix crash on exit on Windows 7
2013-11-22 20:16:03 +00:00
Merov Linden
ce5baf14ac
Pull merge from lindenlab/viewer-release
2013-11-18 16:07:55 -08:00
Merov Linden
6ec99570cd
MAINT-3320 : Fixed! Inventory panels are not resistant to folder root deletion, using handle instead of pointer and cleaning things consistently
2013-11-15 15:12:11 -08:00
Merov Linden
e6b4b89bf1
MAINT-3320 : WIP : Use handle for elements that'll get deleted under us, quite a bit of debug spam to clean later
2013-11-11 18:39:02 -08:00
Richard Linden
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
Richard Linden
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
Richard Linden
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
Richard Linden
ab8f64a967
converted memory tracking units to KB from B
...
added more memory tracking to LLFolderView and kin
2013-09-24 00:05:43 -07:00
Richard Linden
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
Richard Linden
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Gilbert Gonzales
c767354a20
merging viewer release
2013-08-28 18:30:38 -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
Merov Linden
1c740dfb51
Pull merge from viewer-release
2013-05-22 14:21:49 -07:00
Merov Linden
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
Gilbert Gonzales
fb27eae155
ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB icon, and FB name: Found a couple bugs that were causing the positioning of text to be incorrect in the 'Peope you may want to friend' tab.
2013-05-09 17:36:04 -07:00
Merov Linden
00275301fc
ACME-275 : Fixed! Filtering on FB list works (tested with simulated data only so far)
2013-05-06 18:31:27 -07:00
Merov Linden
ad12517329
ACME-275 : WIP : Filtering
2013-05-03 17:03:37 -07:00
Merov Linden
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
Merov Linden
2cc1fb250f
CHUI-849 : Use a time limit for filtering instead of number limit, use a different limit for visible and unvisible lists
2013-04-19 16:51:44 -07:00
Oz Linden
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
Merov Linden
03ad10d258
CHUI-849 : WIP : Filter limit on time instead of number of items
2013-04-18 19:46:08 -07:00
Merov Linden
e84c97e86d
CHUI-912, CHUI-849 : Propagate arrange request correctly, limit sort, improve filter perf, clear traces, add comments.
2013-04-16 19:24:47 -07:00
Merov Linden
0ecbbe9571
CHUI-912 : WIP : Try to change the return value of filter() so to trigger arrange on the fly.
2013-04-15 11:16:57 -07:00
Merov Linden
b05bf882db
CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to be deleted)
2013-04-11 19:02:16 -07:00
Merov Linden
d533a33f42
CHUI-912 : WIP : Add traces to various aspects of the inventory filtering, sorting and arranging (to be deleted)
2013-04-08 18:59:21 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
prep
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
Merov Linden
dac026a7d6
CHUI-735 : Fixed! Handle the backspace case, suppress the search string handling from LLFolderView (it's in the search edit field now).
2013-02-07 13:27:32 -08:00
Merov Linden
7ed270ff9d
CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.
2013-02-06 18:11:52 -08:00
Merov Linden
6a68f16f2e
CHUI-732 : Fixed! Do not iterate through selection while modufying it at the same time, use a temp set.
2013-02-04 19:29:05 -08:00
Tank_Master
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
Ansariel
3073c750ae
Some more caching of frequently called gSavedSettings
2013-09-06 20:31:24 +02:00
Tank_Master
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
Ansariel
0387b41dfb
Performance improvement in llfolderview.cpp
2013-07-30 00:28:14 +02:00
Gilbert Gonzales
d0204ab367
CHUI-687: Problem: User sees inventory offer notifications for deleted items when logging in from do not disturb mode. Resolution: If an item that is deletes has a DND notification saved, then remove that notification so that it doesn't appear onec the user exists DND mode.
2013-01-23 09:51:17 -08:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
Cinders
c7196a5d4d
Fix llui build
2013-06-26 18:11:11 -06:00
Ansariel
8d01b45708
Re-apply FIRE-6714: Don't move objects to trash during cut&paste (untested so far)
2013-06-26 23:19:02 +02:00
Tank_Master
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
Merov Linden
4ef1181cdc
CHUI-659 : Fixed : Reimplemented open selection on hitting return the right way
2013-01-08 21:46:00 -08:00
Merov Linden
090636f107
CHUI-429 : Fixed! Add a flag to filter multi/single selection situations in menu building. Implement in conversation contextual menu.
2012-12-20 18:36:01 -08:00
Merov Linden
7f2ea292e1
CHUI-474 : Fixed. Refresh the participants list in torn off dialog more often.
2012-10-31 19:27:41 -07:00
maxim_productengine
a780eb1a92
CHUI-418 FIXED Check that mViewModelItem is not NULL
2012-10-23 13:20:53 +03:00
maxim_productengine
89ba6b793a
CHUI-418 FIXED Check the existence of mViewModelItem before calling potentiallyVisible().
2012-10-19 13:50:55 +03:00
William Todd Stinson
9da9b2d84b
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-10-17 14:32:29 -07:00
Gilbert Gonzales
8e1a9e2813
CHUI-102: Cleaned up code after code review.
2012-10-01 13:54:53 -07:00
Gilbert Gonzales
11a148415e
CHUI-102: Now the participants and one-on-one conversations have right-click-menus. These menus are functional as well, but 'chat history' does not yet work.
2012-09-28 18:22:05 -07:00
Gilbert Gonzales
59a6a23ee0
CHUI-283: within LLFolderView::scrollToShowItem(), adjusted the calculation that scrolls to the selected item. My prior commit changed this calculation and adjusted it in this commit to preserve prior behavior.
2012-09-20 16:33:21 -07:00
Gilbert Gonzales
381c13d0e5
CHUI-283: Refactor of how the layout is determined for LLFolderViewItem. Changed constant members that defined the layout to non-const member varaibles, which are populated using a .xml file.
2012-09-20 16:12:28 -07:00
Todd Stinson
6d84272d38
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-08-23 15:11:10 -07:00
Todd Stinson
9488baada3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-08-09 12:06:09 -07:00
Todd Stinson
2b026a8066
CHUI-272: BUGFIX Correcting the inventory filtering so that a large number of items in the inventory are completely processed before the filter's modified flag is cleared.
2012-08-08 18:17:01 -07:00
Richard Linden
c43eedd434
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
2012-08-02 20:47:02 -07:00
Richard Linden
faac868b68
CHUI-223 FIX Selecting to cut an inventory item causes all open inventory windows to refresh
2012-08-02 20:45:52 -07:00
Gilbert Gonzales
a87b27c41d
merging of latest code
2012-08-02 09:45:59 -07:00