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

6828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lirusaito
05274c108e Oops! Fix menu_viewer.xml (Thanks for pointing this out Damian!) 2016-05-28 16:32:10 -04:00
Lirusaito
ca6745e955 Guess that's not ready to merge. 2016-05-27 14:09:38 -04:00
Lirusaito
a8cf4a51b3 Seriously? I swear I hit save. 2016-05-27 12:52:29 -04:00
Lirusaito
330e30607a Update LLAgentCamera 2016-05-27 12:42:17 -04:00
Lirusaito
f33429f1bb Buncha pointless sync and cleanup 2016-05-27 12:17:30 -04:00
Lirusaito
8f14d86a5e Re: Woops. 2016-05-27 10:53:48 -04:00
Lirusaito
7d73969c57 Oh gawd how did this happen? 2016-05-27 10:49:13 -04:00
Lirusaito
6fcbe9d0de Increase DEFAULT_MAX_AGENT_GROUPS to 60 
Also cleans up limits code stuffs and syncs indra_constants a bit.
 2016-05-27 09:27:43 -04:00
Lirusaito
e5886e0959 Add option in Singularity menu to Resync Anims 
#close SV-1321
 2016-05-27 08:39:18 -04:00
Shyotl
8ff1f46d08 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2016-05-26 22:35:43 -05:00
Shyotl
fb96010d2a Remove some console spam introduced when fixing issues with inventory filtering. 2016-05-26 22:35:14 -05:00
Lirusaito
7c6d21f67a Woops, this line stays. 2016-05-26 14:39:22 -04:00
Lirusaito
fb9101598a Update RLVLocks 2016-05-26 13:10:27 -04:00
Lirusaito
cfea4f4ccf Compile Fixes 
Updates RLVHelper.
 2016-05-26 12:46:04 -04:00
Lirusaito
4bfd4b38bc Aaaand more, this time for llagentwearables.cpp 2016-05-26 11:51:49 -04:00
Lirusaito
a388ddb0d0 More of the last, this time update llattachmentsmgr.cpp to the latest. 
Hopefully it'll compile now?
 2016-05-26 11:03:08 -04:00
Lirusaito
3bedb5f6d4 Sync llappearancemgr.cpp with upstream and rllva 
Remove old unused stuff
Comment out some questionable stuff that's not upstream
Rearrange a thing to match upstream

Hopefully this fixes the baking bug?
 2016-05-26 10:13:42 -04:00
Shyotl
0abb0c916c Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git 2016-05-26 02:28:34 -05:00
Shyotl
78eace26b3 Buffer overrun in LLMeshRepository::notifyLoadedMeshes 2016-05-26 02:22:38 -05:00
Shyotl
899ba7fded Fixed folder collapse state not being properly restored after clearing search string. 
Updated inventory filter classes.
LLInventoryView renamed to LLPanelMainInventory for easier diffing.
 2016-05-26 02:22:19 -05:00
Lirusaito
c161a47970 Drake says we actually wanna doing this. 2016-05-10 21:08:20 -04:00
Shyotl
f89a5aaa27 Eups. Fix chatlog and user dir. 2016-05-03 01:54:50 -05:00
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