3f145c0c3f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563
...
# Conflicts:
# indra/llcommon/llframetimer.cpp
# indra/llcommon/llprofiler.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-08-30 22:17:59 +02:00
b0f88bef63
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-30 11:25:02 +02:00
c5d9c3c2a7
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2022-06-03 15:07:06 +02:00
d9b93890ef
Initialize a LLUUID with LLUUID::null
2020-09-28 00:30:21 +02:00
a8811ebdf9
Disabling C4018 compiler warning in DAE export is apparently unnecessary
2020-09-28 00:27:11 +02:00
a4aff377e6
Merge branch 'master' into fs-vs2017
2020-04-29 20:02:19 +02:00
3a96f21d27
DAEExport: unify textures in one UVMap option
2020-04-21 00:46:10 +01:00
9335eded97
Merge with viewer-vs2107
2019-12-08 17:18:43 +01:00
28b8a4416a
FIRE-24016 - apply chnage suggested by Angus Boyd for meshes that exceeed 64K verts on export
2019-06-17 09:52:43 +01:00
6270e39990
Fix EOL
2018-06-23 02:32:06 +02:00
dcab2e1025
FIRE-5782: Threaded file pickers for export floaters
2018-06-22 23:20:16 +02:00
beb2d59bde
Reformat statement to make it clear for GCC (otherwise it commplains about bool and int comparison).
2018-03-26 20:23:19 +02:00
ebb14abbd8
FIRE-13474: Fix Collada export to filenames containing brackets fail
2018-01-24 13:00:10 +01:00
687da1144c
Just in case gAgentUsername is empty...
2017-02-23 11:15:33 +01:00
4608aeb505
Transplant MAINT-7118 and fix some bad design on the way
2017-02-23 10:54:25 +01:00
fce97c4aae
Build fix
2016-04-02 04:37:21 +02:00
3b3c667894
Build fix
2016-02-21 03:16:25 +01:00
c29da915b5
Add show correct message if Collada DAE export fails
2015-05-20 12:23:01 +02:00
babb652f48
FIRE-15733 Do not count mesh when calculating oxp objects to export.
2015-03-22 17:47:32 -04:00
a7111940bc
Replace childSetText with childSetValue and add missing includes for LLViewerRegion.
2014-06-10 12:34:16 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
b5f8a28325
Allow saving to pathnames that have embedded unicode characters (eg German Umlauts).
2013-11-22 23:52:13 +01:00
4e1f7ce4e8
Save some frames from updating export info when llselectmgr signals change but we have the same object selected
2013-10-01 17:49:02 -06:00
8e61bb0ff1
Fix the export texture panels and don't destroy and recreate them every dirty
2013-10-01 13:14:35 -06:00
b87addd1f8
Clean up some unused variables in daeexport
2013-09-30 22:33:42 -06:00
0e3c1d3669
Updates to collada exporter
2013-09-30 02:48:36 -06:00
f5c47249f8
Fix very dumb collada texture bug.
2013-09-28 16:31:07 -06:00
1671f5c918
Fix timestamps in exporters
2013-09-28 07:22:24 -06:00
5c0e632ad5
Export improvements:
...
FIRE-9625 - Make Import Linkset work like the other uploaders
FIRE-11646 - Option to not backup object contents
Combined permission checks into a single namespace
Added object export floater for a more consistent workflow with collada export
2013-09-27 23:27:00 -06:00
bf6ce25f97
Small addition to previous commit, in CPP
2013-09-21 11:29:29 +02:00
169464ebf9
Port over latest changes to Singularity's DAE exporter with modifications
2013-09-20 15:24:47 -06:00
4e66a4144e
DAE export permissions improvements
2013-08-28 13:51:01 -06:00
f6628f47e1
Add Collada dad export with permission from Latif Khalifa of Singularity, with modifications
2013-08-27 17:49:30 -06:00
Ansariel