6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -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
edf2b52cb2
MAINT-3082 : Remove unused viewer LLParcel code
2013-09-03 17:18:59 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
cc31b4ae79
SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
...
SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary
made llerrs/infos/etc properly variadic wrt tags
LL_INFOS("A", "B", "C") works, for example
fixed unit tests
remove llsimplestat
2013-08-12 20:05:16 -07:00
958292740c
Merged with RLVa tip
2014-02-26 22:44:49 +01:00
0c70c66dea
- fixed : GCC specific change
...
--HG--
branch : RLVa
2014-02-03 14:49:36 +01:00
2fd30a5fe3
- changed : "Give to #RLV" agent-to-agent offers can contain subfolders
...
-> limited to 3 levels (e.g. #RLV/~FolderA/FolderB/FolderC)
-> #RLV folder is auto-created if it doesn't currently exist
--HG--
branch : RLVa
2014-01-08 00:33:27 +01:00
a8427d3479
FIRE-12289: Fix display of missing T in debug permissions
2013-12-01 18:47:22 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08: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
d27fc4ad33
MAINT-2257 : Create ability to limit region/estate and parcel access by
...
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-08-07 15:56:29 -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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
46ab23c94b
llinventory merge fixes
2013-03-11 18:02:16 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -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
6dd1891d4f
Initial guts for OpenSim's export permission cap
2013-08-11 15:40:11 -06:00
f48011e4d0
SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
2013-01-15 20:30:20 -05:00
b04e00b2a3
Fix a few implicit double to float conversions, pedanticly add a few missing function prototypes
2013-07-28 14:41:32 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
c9044c03b3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-09 18:51:23 -08:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
fe04921c21
MAINT-1601 Land remains for sale after purchasing for group.
...
reviewed with Simon
2012-09-21 13:32:25 -07:00
7153d1db11
Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable
2012-09-20 04:29:17 +00:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
cf7eb79fa7
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-08 04:39:11 +00:00
371b66a6ef
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-09-06 11:47:48 -07:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
4e7c2c6942
CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some folders reporting wrong creation date.
2012-08-02 22:49:42 +03:00
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
f138120086
FIRE-7773: Corrected parcel category for search; "Any" is apparently only valid for searches but not as parcel category
2013-02-23 02:22:41 +01:00
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
Tank_Master