Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,570 Commits 20 Branches 51 Tags
96e88b97efaa8467d2d3efdbf3d144fc20d64196
Commit Graph

99 Commits

Author SHA1 Message Date
Inusaito Sayori
72080e79e9 Sync llcommon with Alchemy a bit. 
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
 2015-03-20 22:04:04 -04:00
Shyotl
b865b92a6a Merge branch 'FMODStudio' 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
 2015-01-26 17:15:46 -06:00
Inusaito Sayori
0d4ac69465 [Warnings] Fix sign/unsigned mismatch 2014-12-12 20:21:36 -05:00
Inusaito Sayori
232bf22e51 Compile foxies 2014-12-05 18:43:50 -05:00
Inusaito Sayori
808e262a4d MAINT-3562 FIXED Viewer crashes when updating local textures using Substance Designer : add code for control input buffer size 
3e69e78acb
 2014-11-26 01:23:45 -05:00
Shyotl
c2abbaedc8 Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio 2014-11-22 22:20:32 -06:00
Inusaito Sayori
8b658bd628 Attempted fox for PNG 2014-11-20 12:21:35 -05:00
Lirusaito
bd94e2ae73 Linux64 library update! (other platforms to come) 
Curl 7.38
LibPNG 1.6.13
LLQTWebkit 4.8.6
OpenSSL 1.0.1j (Yep, this fixes POODLE)

Libraries provided by Alchemy Viewer.
 2014-10-21 05:41:44 -04:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Shyotl
7c7c64bde3 Minor upstream catchup. Added LLImageRaw::duplicate and no_copy parameter to LLImageRaw::LLImageRaw 2013-10-26 16:39:31 -05:00
Drake Arconis
0e3a9b28bd CMake cleanup and organization 2013-03-05 12:24:51 -05:00
Drake Arconis
b800320a49 Remove LLMemType and related files 2013-03-04 12:02:01 -05:00
Shyotl
76f3dc9e19 Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback. 2013-02-19 01:50:46 -06:00
Shyotl
54771409d6 Merge branch 'master' into sunshine 
Conflicts:
	indra/llimage/llimage.cpp
	indra/llui/llui.cpp
	indra/newview/llvoavatar.cpp
 2013-01-08 17:05:29 -06:00
Shyotl
d71210e942 Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory) 2013-01-07 14:44:54 -06:00
Aleric Inglewood
cfa8df0575 Merge branch 'master' into llwebprofile 2012-12-14 20:43:17 +01:00
Aleric Inglewood
15b6593143 Large snapshot update (part 2) 2012-12-14 02:31:08 +01:00
Aleric Inglewood
d8bc84adb1 Snapshot fixes and improvements. 
* Allow to pass -1 to LLImageBase::reallocateData too (default parameter),
  causing it to allocate what is necessary for the size set (same
  behavior as allocateData).
* Speed up LLImageRaw::scale with factor 2 or 3 by copying the data less
  often and calling LLImageBase::reallocateData instead of destroying
  and recreating always.
* Fix gl_rect_2d to not decrement top and right with one pixel.
* Remove the vague "Constrain Proportions" checkbox and replace it with
  a new combo box and spinner to explicitly set the target aspect ratio,
  allowing to set it also to something different than either the window
  aspect ratio (ie, 1.6) or the target image dimension (1.0 for textures)
  which was totally lacking when, for example, uploading a profile image
  (which needs to be 4:3). This also allows to show snapshots on prims
  of arbitrary aspects.
 2012-12-04 00:45:01 +01:00
Shyotl
794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit 
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
 2012-11-29 11:54:41 -06:00
Siana Gearz
303c74f4c9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 
Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
 2012-11-12 06:46:58 +01:00
Shyotl
43271f290e A few more alignment bits and bobs. 2012-10-16 20:07:04 -05:00
Drake Arconis
5b8b88e05a Nuked ancient uneeded things 2012-10-04 17:56:25 -04:00
Aleric Inglewood
8430328043 Add support for uploading JP2 files. 
Recognizes .jp2, .j2c and .j2k extensions.
Adds image/jp2 files to file picker image filter (windows and Mac,
windows apparently already showed them).
Show preview for jpeg 2000 files.
Fixes error reporting for failed image uploads.
Enforces a power-of-two size for jpeg 2000 files (seemed to make sense to do that).
 2012-09-29 17:47:15 +02:00
Aleric Inglewood
f1c635d103 Cherry pick from curlthreading2 2012-09-04 23:34:11 +02:00
Aleric Inglewood
169670a58b Refurbish last merge. Fix compile for standalone and libcwd. 2012-08-13 19:30:35 +02:00
Drake Arconis
1e81966b89 Clean up and updates 
Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files

             /\_..._/\
             |/ \_/ \|
             | o.-.o |
             \ ( O ) /
             /'--U--'\
             |  .:.  | /\
             | /:;:\ |` /
   Drake     | |:;:| |-'
  Arconis   /  |'-'|  \
            `""`   `""`
 2012-07-20 08:13:07 -04:00
Drake Arconis
8bfdc98ef4 Improvements! 
Fixed Boost library to not throw warnings
Changed PNG cmake slightly
Updated 32lib package for correct locations
Cleaned up flags a bit for linux64
 2012-07-19 17:44:19 -04:00
Drake Arconis
7af331c50d First set of changes for new librarys and lib layout support! 
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
 2012-07-04 00:26:42 +00:00
Drake Arconis
8eb319d3ba Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers 2012-07-02 21:08:04 +00:00
Lirusaito
24db228406 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
	indra/newview/llpaneleditwearable.h
 2012-07-02 04:14:52 -04:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Aleric Inglewood
4391614d6e AIThreadSafe* update. 
Updated/added documentation.
Removed AIThreadSafeWindowsHack that annoyed me (fix your compiler).
Don't use 'static' in anonymous namespace.
Use the AIThreadSafe*DC variants for default constructed objects,
as opposed to the AITHREADSAFE* macro's.
 2012-06-27 04:27:07 +02:00
Siana Gearz
01d6095242 Apparently overestimating j2c size is always a bad idea 2012-03-31 03:45:22 +02:00
Siana Gearz
3acf6dc001 Another stab at making textures work as they should 2012-03-27 16:23:55 +02:00
Siana Gearz
fee59e83b8 Fix size estimation 2012-03-26 19:53:04 +02:00
Siana Gearz
8b6f462d13 Wholesale update of llmessage to V3.2 
Note that this removes message logger for now.
 2012-03-06 07:31:15 +01:00
Shyotl
b0ccec2b62 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 
Conflicts:
	indra/newview/llvoavatar.cpp
 2012-02-01 03:10:46 -06:00
Aleric Inglewood
e1675f6bd1 Remove erroneous comment. 2012-02-01 03:32:10 +01:00
Shyotl
9453c2c2e9 Memory tracking system updated. 2012-01-29 01:33:14 -06:00
Shyotl
ffb285c6ff Huge renderer update (WIP). Still plenty to do, especially pertaining to UI. 
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
 2011-12-09 14:02:29 -06:00
Siana Gearz
41a305f52b OK seriously, how dumb can i be? 2011-10-13 18:55:16 +02:00
Siana Gearz
6590172641 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-04 16:26:11 +02:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
84a301c81a new throws an exception... checking if the return value is not null without either try/catching or using std::nothrow... would accomplish nothing. 2011-10-03 22:42:56 -05:00
Siana Gearz
9ac2c07f52 Merge https://github.com/PlayerDagostino/SingularityViewer into future 
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
 2011-10-03 16:10:35 +02:00
Shyotl
244e30297f AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs. 2011-09-20 22:08:48 -05:00
Shyotl
d917bf6b06 LLAPRFile cleaned up 2011-09-20 21:39:27 -05:00
Aleric Inglewood
3bde58d970 Wrap sGlobalRawMemory in AIThreadSafe. 
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
 2011-08-18 19:32:45 +02:00
Player Dagostino
4d2447d764 Enable the DSO workaround on linux only AND in standalone. 2011-08-11 02:12:28 +02:00
Player Dagostino
a45de10024 Fix a problem not letting plugins work when the client is built on RedHat and derived systems (Fedora is affected too). Completely avoid apr_dso_load() on Linux (they modified it to open libraries with RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND). Get a standard DSO handle with RTLD_NOW | RTLD_GLOBAL flags instead, and convert it to a valid APR one by using apr_os_handle_put(). 2011-08-02 20:15:58 +02:00