4dc6285816
Merge LL V3.7.15
2015-01-14 13:06:49 +01:00
df3e6b40fd
merge changes for 3.7.12-release
2014-07-21 14:48:30 -04:00
4da7f68549
VWR-25689 Support 'older than' when inventory filtering
2014-06-05 17:06:59 -04:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
b9910a58df
FIRE-12992/MAINT-3789 FIXED When moving items between inventory folders, the moved item is no longer highlighted in the new folder.
2014-03-07 20:27:12 +02:00
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
b507bf2987
Fix inbox and outbox folders after merge
2014-05-17 21:21:40 +02:00
e3ea0378b6
Merge LL 3.7.6
2014-05-17 11:18:52 -07:00
504509c288
MAINT-3789 FIXED When moving items between inventory folders, the moved item is no longer highlighted in the new folder.
2014-03-07 20:27:12 +02:00
e22c24bfbb
Merged with RLVa tip
2014-02-27 00:58:36 +01:00
d9cf89781e
- internal : re-add an improved version of starting a conference from calling cards that got lost in the CHUI merge
...
--HG--
branch : RLVa
2014-02-27 00:56:13 +01:00
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
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
148c3780e1
MAINT-3320 : WIP : Introduced a cleanOutbox() method to be called on outbox deletion
2013-11-13 13:29:51 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
c2f5365f98
Pull merge from lindenlab/viewer-release
2013-10-14 16:30:08 -07:00
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
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
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
f1e09a95f2
Merged with default tip (Revision 0568de92960a)
...
--HG--
branch : RLVa
2013-09-02 11:30:14 +02:00
68c5665951
Merged with RLVa LL merge to make Mercurial happy
...
-> no-op merge with slight cleanup
2014-02-26 21:47:15 +01:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
574e054b09
- internal : reviewed @startim for CHUI (SL-3.5)
...
-> fixed : "Send Instant Message" on a calling card opens an IM session
-> fixed : "Start Conference Chat" on a selection of multiple calling cards opens an IM session
-> fixed : actions that would result in an IM window opening shouldn't be blocked if the session is already open
-> added : RlvActions class to mimick LLAvatarActions and lowering the rlvhandler.h include dependency
--HG--
branch : RLVa
2013-05-09 15:09:03 +02:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
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
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
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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
4101c43f5f
Merged with viewer-sunshine tip (Revision 87a6fc812214)
...
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
9a75eeb67e
Fix for build issue under windows
2013-02-11 14:39:05 +02:00
5ecac2e900
CHUI-735 : Fixed! Refactor the code to move isSelectionRemovable() to the LLInventoryPanel level. Use it when using the delete key.
2013-02-08 22:38:54 -08:00
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
7ed270ff9d
CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.
2013-02-06 18:11:52 -08:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
9b52a0d15a
MAINT-2287 : WIP : Make inbox and outbox visible and accessible if InventoryOutboxMakeVisible is set (default is false)
2013-01-25 17:35:56 -08:00
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
Ansariel