Commit Graph

6806 Commits

Author SHA1 Message Date
Lirusaito
b4f0ea4c78 More merge? More merge. 2016-05-03 00:08:32 -04:00
Lirusaito
3242683ee3 Alchemerge~ 2016-05-02 23:18:09 -04:00
Lirusaito
32039e8b58 Too many thoughts at once. 2016-05-02 23:00:00 -04:00
Lirusaito
b77b5bbabc Fix skin packaging for gemini
Adds package_skin to clean up redundant skin packaging code
2016-05-02 22:25:41 -04:00
Lirusaito
44cc052d40 Forgetful Liru 2016-05-02 21:53:17 -04:00
Lirusaito
f14ad54c84 Linux compile fixes
Reapplies a fix from c3e593c20e

Updates libraries (FMOD Studio 1.08.01)

Don't use boost chrono, the standard has chrono!
2016-05-02 21:17:36 -04:00
Lirusaito
f0a6ffcabf Hopefully fix the logs thing? 2016-05-02 19:32:15 -04:00
Lirusaito
e50899dc68 Feature Request: Option to focus on avatar from instant message with them
Will be in the dropdown in IM at the bottom, only if they're in the sim...
Actually, this feature works pretty well as an in-sim indicator (if it works as intended!)
2016-05-02 19:06:12 -04:00
Lirusaito
a8062d732e Clean up upstream merge artifact 2016-05-02 15:17:06 -04:00
Lirusaito
39b3f58e13 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
# Conflicts:
#	indra/newview/llvoavatar.cpp
Also Reverted reversion of removal of before() wrapper in llstl.h
2016-05-02 15:15:06 -04:00
Shyotl
9e354801d8 Fix up generated artifact naming to include full unspaced channel name as well as arch. 2016-05-01 23:05:34 -05:00
Shyotl
df0b7a08cf New library dependency: libboost_chrono 2016-05-01 20:43:01 -05:00
Shyotl
40b5627f7b Use the correct xmlrpc prebuilt for win32. 2016-05-01 20:26:44 -05:00
Shyotl
f26a5e9d62 Added FTType to texture fetch methods. Baked texture fetch now uses dynamic retry policy. 2016-05-01 19:44:06 -05:00
Shyotl
abb4b1ac7c Fix for scrolllist columns not resizing when header width is adjusted. 2016-05-01 19:41:19 -05:00
Shyotl
62ee456084 Ignore "BackgroundYieldTime" setting if file picker window is open (Improves responsiveness of said window) 2016-04-26 13:42:47 -05:00
Shyotl
55b5f60b68 V3 mesh, texture, and hover merge. 2016-04-26 13:36:39 -05:00
Lirusaito
cd66c61214 Just do it! 2016-04-15 03:43:34 -04:00
Lirusaito
62e8400c3c Add Log button to Profile, (and rightclick menus for lists) as per request. 2016-04-15 03:26:02 -04:00
Lirusaito
de95e07907 Fix Deltek's issue: Altering the disk cache size is spammy 2016-04-15 02:49:55 -04:00
Lirusaito
b05f6ee9da Sync llspatialpartition, fixes compile of two commits ago. 2016-04-12 20:57:23 -04:00
Lirusaito
b90d905cc5 Allow exclusively filtering out Landmark offers with AntiSpamItemOffersLandmarks.
This was requested on our JIRA, but then no one suggested any other things to filter.
2016-04-12 20:55:40 -04:00
Lirusaito
56bc3ae67a Oh gawd this is gonna conflict with Shyotl..
but you people wanted Render Weight for some reason... so here it is...
Now we'll send it to the server, rejoice.
2016-04-12 20:02:25 -04:00
Shyotl
be5d2f20bc llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default. 2016-04-11 02:51:08 -05:00
Shyotl
d40256fb31 llprimitive merge 2016-04-08 19:32:13 -05:00
Shyotl
691a5395ca llmessage merge and further LLUnit usage. 2016-04-07 20:17:30 -05:00
Shyotl
8c946dc706 llmath merge 2016-04-06 01:56:39 -05:00
Shyotl
6ced17242b llimage merge 2016-04-06 01:39:56 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Shyotl
0fa7848b19 llcharacter merge 2016-04-04 23:45:15 -05:00
Shyotl
989c40e59a llaudio merge 2016-04-04 00:38:57 -05:00
Shyotl
df41722c98 llappearance merge 2016-04-04 00:16:55 -05:00
Shyotl
9214750a90 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2016-04-03 13:22:36 -05:00
Lirusaito
9fee430d7d Windows, please. 2016-03-31 22:17:16 -04:00
Lirusaito
62b6531468 I thought I'd done all these right already... meh~ 2016-03-31 07:38:43 -04:00
Lirusaito
0c75255da7 Woops, for real this time! 2016-03-31 05:11:26 -04:00
Lirusaito
3e4f099ef2 Sync LLCompileQueue, fix compile (...queue) 2016-03-31 05:05:13 -04:00
Lirusaito
2653567d82 Sync with alchemy
Moves some constants out of llavatarconstants.h
8ebf8f4608bd: Change various const constants to constexpr
e07d5d43ba30: CID-143595
30b6935fc66d: CID-143595
acc96f9051cb: Fix a memory leak in viewer side baking initial wearable setup
Sync llmodel.*

Changesets assimilated:
f8f7706c2902: CID-143554 - fix out of bounds access
223eb65adce4: CID-143554 - Chase
2ceb49aaa133: CID-42838, CID-42930, CID-42933, CID-42938, CID-42940, CID-42945, CID-42948, CID-56111, CID-83907
d220005d9f23: Missing null check before deref
31dbb0f3b6ee: CID-42571 CID-42576 CID-42578
49caf082e65c: change unordered_map to flat_map
Doesn't cause as many problems as a hashmap when it comes to assumptions in the
LLUI system.
f93f5e881484: "update" linux cef
downgrade to fix javascript problems
cba818dd9269: Various null checks and etc.
1b4c6bc483bb: CID-42847, CID-42854, CID-42886, CID-42921, CID-42922, CID-42923, CID-42924, CID-42925,
CID-42927, CID-42928, CID-83871, CID-83876, CID-83878, CID-83880, CID-83900, CID-143573
0fe90cd9ec24: Various file size related things
a79f6f653dca: CID-42918 - Initialize member pointers in LLFloaterGodTools
0b70d600d978: Tweak LLFloaterBuyLand initializations
e8b173ffe813: CID-42854 - Additional fix to LLDrawInfo
b5d745cf3fde: Fix signage
4f2e2f384781: Initialize and cleanup various class member variables.
CID-42899, CID-42900, CID-42902, CID-42903, CID-42904, CID-42905, CID-42909, CID-42910,
CID-42911, CID-42912, CID-42913, CID-42967, CID-83853, CID-83898, CID-83890, CID-143584
9851a3e39b4c: Fix platform specific include directories
5c074e84f1be: Initialize and clenaup various more class member variables.
CID-42885, CID-42853, CID-42894, CID-42895, CID-42896, CID-83908, CID-143574, CID-143575,
CID-143576, CID-143576, CID-143578
ac262854ac92: Brace sub-object in initialization to make our intentions clear to clang
358da477d4c1: More double brace init
c3850119314a: Initialize various member pointers in panels
CID-83902, CID-83903, CID-83905, CID-83909, CID-83911, CID-83912, CID-143572
2016-03-30 21:06:47 -04:00
Lirusaito
7a48138404 But... I was so careful... 2016-03-30 03:43:50 -04:00
Lirusaito
32d3f9e929 Blah blah blah include blah 2016-03-29 21:07:04 -04:00
Lirusaito
1c0abf39fb I swear I changed this back to name already. 2016-03-29 19:15:52 -04:00
Lirusaito
86a657f49c Update llgroupmgr because why not. 2016-03-29 18:51:55 -04:00
Lirusaito
25937e42fe I knew there was one more thing I had to do here. 2016-03-28 18:56:32 -04:00
Lirusaito
4afc6f5b6a Woops, removed the wrong set of two. 2016-03-28 07:58:30 -04:00
Lirusaito
48e6e4eb98 Sync up llaudio/llaudioengine_fmodstudio.cpp: Compile now, please? 2016-03-28 07:50:48 -04:00
Lirusaito
89be63603a Turn off pulseaudio support because it explodes right now 2016-03-28 01:57:44 -04:00
Lirusaito
e62261edb2 Sync with Alchemy, includes much awaited lib updates for Linux
Applies ALCH-420 - Replace all invisiprims with fully transparent texture and remove dead code paths
-ARC no longer takes invisis into consideration.

Syncs some script keywords updates.

Changes all "\n" in llfloaterabout.cpp to '\n' because screw.dat
2016-03-27 23:24:17 -04:00
Lirusaito
af58abb7ec Fix symbols filename generation still relying on dead CMAKE Vars. 2016-03-24 00:46:19 -04:00
Damian Zhaoying
0383d4492f Update spanish translations in menu_viewer.xml, panel_preferences_ascent_system.xml and panel_preferences_chat.xml files. 2016-03-23 02:43:15 -04:00
Lirusaito
5e7f64daaf Alchsync: generate_breakpad_symbols.py 2016-03-23 02:32:26 -04:00