e9c0a93f99
Fix merge-related compile errors
2019-11-14 15:19:55 -07:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
e439f0366f
Merge from lindenlab/viewer-release
2019-08-29 15:43:02 +03:00
723f1891db
Merge 6.3.1 viewer-release
2019-08-26 12:35:18 -07:00
a2d91f3160
DRTVWR-493 LLLocalBitmapMgr to Singleton
2019-06-20 20:53:46 +03:00
6bb496625f
SL-9746 [EEP] Local Texture options should work with EEP
2018-10-08 20:27:10 +03:00
7abb0c99be
[DRTVWR-476] - add universal head,upper,lower tattoos
2018-06-13 01:09:27 +05:30
56fc3222dc
[DRTVWR-476] - create new wearable type
2018-06-08 20:36:49 +05:30
0fdbe7e34d
Merge
2018-05-21 16:47:42 -07:00
3bf89821d9
[DRTVWR-455] - added 5 new bake channels
2018-05-21 16:00:52 -07:00
d9064d3a4e
MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture.
2018-02-27 15:49:15 +02:00
d6b0db5118
MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
2016-08-26 17:02:32 +03:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
0e155c51a9
MAINT-6257 Textures loading issues.
2016-03-29 18:52:54 +03:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
30f9287645
MAINT-2199 reverted previous change, refixed missing cloud and ban line
2016-03-03 00:15:33 +02:00
b3e7fff9ae
MAINT-2199 restored original UI mechanics, removed icons from UI list
2016-02-27 16:06:54 +02:00
10e2bd56c1
MAINT-2199 In some rare cases priorities can change, it shouldn't affect texture list.
2016-02-18 17:35:43 +02:00
a0e9ee4757
MAINT-2199 separating UI elements from in-world textures.
2016-02-16 20:44:53 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
d9341caf45
MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected
2015-07-17 17:36:33 +03:00
b59770199a
Merge from viewer-release
2015-06-05 16:30:04 +03:00
bb87365c37
Merge viewer-release, become version 3.7.29
2015-04-28 13:36:35 +03:00
3ae8a821c3
merge
2015-04-24 08:55:20 -04:00
32940ee90b
merge
2015-04-13 17:19:27 -04:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
65e6cc6704
MAINT-5039 FIXED Viewer crashes at logout if wearing clothing textured with a local texture
2015-03-31 12:51:07 +03:00
90573badb4
MAINT-3585 FIXED (Crashes when attempting to upload image.)
2015-03-30 20:11:27 +03:00
a6ff7db101
MAINT-3585 FIXED (Crashes when attempting to upload image.)
2015-03-30 20:11:27 +03:00
6aa63dce33
SL-103 WIP - viewer enforces wearable limits based on total articles of clothing rather than per-type limit. Limit is artificially low for testing, will bump before release.
2015-03-05 16:17:45 -05:00
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
df5fbad3fc
Update to build on Xcode 6.0: remove an unused const variable
2014-10-19 15:40:00 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
61f3bf8a47
MAINT-4137: Correcting a potential crash. This change should fix the most probable location of a callstack being reported by the crash reporter. However, there is no reproduction yet, so hard to test whether this actually patches the crash occcurrence.
2014-06-06 19:30:41 +01:00
bde6023286
MAINT-4137: Correcting some poorly written CPP code that could potentially lead to problems in the future.
2014-06-06 19:28:18 +01:00
47a5e1c751
MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit.
2014-06-05 23:15:43 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
c8e4f2b10e
MAINT-4004 FIXED Check image's dimensions and show notification if it's larger than allowed.
2014-05-07 11:46:47 +03:00
9a8afee83f
SH-3455 WIP - removing bake upload code
2013-09-19 17:52:58 -04: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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ad89d26dc6
norspec-107: remove the need for a friend declaration in local textures
2013-05-24 12:55:52 -04:00
c3804fd041
MATBUG-8: fix local texture support for normal and specular maps
2013-05-24 11:47:06 -04:00
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -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
Dave Houlton