Commit Graph

307 Commits

Author SHA1 Message Date
Shyotl
9e47335f98 Revert raised cache cap. Actual impl is not in this branch. Also use actual unit types for cache size logic because it looks nicer. 2019-07-03 17:50:09 -05:00
Lirusaito
3462f403fe Dullasync
Fixes scaling issue
Also fixes the openid cookie
2019-04-10 06:43:14 -04:00
Lirusaito
f2b39196a0 In dev checkouts, AppViewer now sets AppRoDataDir to newview
Crossplatform, settings, windlights, skins, the works~
No more copying~ <3
2019-03-26 02:23:51 -04:00
Lirusaito
28de2ceed8 [EEP] Change to using LLTranslationBridge::ptr_t 2019-03-24 22:52:30 -04:00
Lirusaito
c5329968f7 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
# Conflicts:
#	indra/llcommon/llstring.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerregion.cpp
2019-03-18 17:30:34 -04:00
Shyotl
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
Lirusaito
62462165b7 [Voice] Actually save the speaker volume settings. 2019-03-13 17:42:26 -04:00
Lirusaito
d2983deb48 Wrap main loop with try, not wrap try with main loop. 2019-03-09 17:25:12 -05:00
Lirusaito
f1bb636f91 Feature Request: Build number in window title 2019-03-09 15:38:45 -05:00
Lirusaito
4218011417 Merge branch 'master' into ManagedMarketplace 2019-03-03 12:56:03 -05:00
Lirusaito
58ba9e3617 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-03-02 19:01:49 -05:00
Lirusaito
fb39f2d511 Merge branch 'master' into ManagedMarketplace
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h
2019-02-28 23:58:08 -05:00
Lirusaito
1df39f81ee [Local Textures] These should persist through relogs, duh! 2019-02-09 19:54:11 -05:00
Inusaito Sayori
f140b4f35c Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings
Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189

mAllowWear=>mAllowOpen (should probably just remove this altogether though
inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes.

Other stuff in this commit:
LLPanelInjector~
Sync lltooldraganddrop to alchemy
Sync notifications up with alchemy
Reorganize notifications some, to better merge with upstream
Remove duplicate InventorySortOrder in settings map
There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~

Wouldn't have been possible without help from Shyotl and music by Amanda Palmer
2019-01-25 19:33:15 -05:00
Lirusaito
3bdf6e553d Add InactiveFloaterTransparency and ActiveFloaterTransparency settings
Dear Users,
This removes FloaterUnfocusedBackgroundOpaque, to achieve the same effect,
modify InactiveFloaterTransparency, 1.5 should do the trick.

PS: The settings are in the Vanity tab at the bottom.

Now for developer nonsense:
Also sync a bunch of the UI code with upstream Alchemy for opts and shtuff.
Also let's translate the tooltips on the buttons on the top right of floaters
Translators note that not all new strings have been translated yet as not all are upstream.
2019-01-24 11:57:44 -05:00
Shyotl
04ea11c61e Make gcc happier. 2018-11-20 02:49:57 -06:00
Shyotl
736696ac36 Track glEnable states via static refs instead of map lookups.
Sync light state, bound shader, and various gl context states similarly to render matrices.
Texture handles now refcounted, as multiple viewer textures could ref the same handle (cubemaps do this)
Clean up gl extension loading a bit. Not necessary, but only look for ARB variants if not included in current core version. Removed unused extensions.
Use core shader api if supported, else use ARB. (FN signatures are identical. Just doing some pointer substitution to ARB if not core.)
Attempt at improving VBO update batching. Subdata updates better batched to gether per-frame.
There's probably other stuff I forgot that is in this changeset, too.

Todo: Fix lightstate assertion when toggling fullscreen with shaders off.
2018-11-19 00:37:48 -06:00
Lirusaito
c92ccf8a44 Branding shtuffs for the Singularity 2017-04-04 20:40:08 -04:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Shyotl
4a9ff22eeb I was critically damp once. It was okay. 2017-03-14 01:44:26 -05:00
Shyotl
98516a2a22 Bento hell and back, and back to hell, and back. 2017-01-11 03:55:36 -06:00
Lirusaito
f33429f1bb Buncha pointless sync and cleanup 2016-05-27 12:17:30 -04: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
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
62ee456084 Ignore "BackgroundYieldTime" setting if file picker window is open (Improves responsiveness of said window) 2016-04-26 13:42:47 -05: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
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05: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
Drake Arconis
6b84bfac15 Add a mechanism with which to determine viewer channel in the case of no commandline option 2016-01-20 10:09:23 -05:00
Drake Arconis
1d2995666f Remove FMOD Ex 2016-01-16 13:07:51 -05:00
Drake Arconis
13666ac62a Change out versioning code for less hacky versioning code 2016-01-16 10:06:07 -05:00
Siana Gearz
62a7704a4f You shaved 2 minutes off compile time...
... but you are still hungry
2015-09-18 04:29:38 +02:00
Inusaito Sayori
dfa40d8939 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2015-08-12 14:52:52 -04:00
Inusaito Sayori
31867a8bbf Alchemy crouch toggle code sync. 2015-07-27 19:08:37 -04:00
Inusaito Sayori
fd5dae59ae Stop hurting my feelings, gcc, I try so hard and you just don't seem to care. 2015-07-23 14:41:53 -04:00
Shyotl
e335848169 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2015-07-23 01:48:45 -05:00
Inusaito Sayori
1a6e99a9e3 Sync with Alchemy to go from keys.ini to keys.xml 2015-07-22 01:53:42 -04:00
Shyotl
41357e579a Missed LLError::LLCallStacks::cleanup call on shutdown. 2015-06-25 20:19:26 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -05:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Inusaito Sayori
8028423c70 Rework HippoGridManager's parseUrl to be called after LLAppViewer::init
No more hangs~

I'm not exactly sure if this exhibits the same behavior it used to, but this doesn't matter because it hasn't worked for versions, probably since AICurl, so no one is relying on it.
It would seem to me that it needs to be called after pumps are created.
parseUrl is now public.

Also, move hippogridmanager.h into AI_UNUSED section of llxmlrpcresponder.cpp, it's part of the unused
2015-02-26 22:57:06 -05:00
Shyotl
87f87bf2ff Delegate stream shutdown to LLAudioEngine and LLStreamingAudio_* 2014-11-25 16:37:39 -06:00
Cinder Biscuits
d0f265f6d9 OMG backout worst fix of the year right here. 2014-10-12 21:56:50 +00:00
Cinder
d6b87f141f Ported viewer-stare fixes 2014-10-10 21:17:47 -06:00
Shyotl
e5a0393480 Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git 2014-09-07 15:46:05 -05:00
Shyotl
89fcf69948 Added several temporary fasttimers to better pinpoint idle stall. 2014-09-07 15:22:19 -05:00
Inusaito Sayori
43a9aedf7d Sync with Upstream Alchemy
Changes LLEnvManagerNew::setRegionChangeCallback to LLAgent::addRegionChangedCallback
Cleans up some of the timeout policies that aren't necessary any longer.
Modernizes parts of LLViewerKeyboard, updates llregistry.h
Begins changeover from LLDynamicArray to std::vector
Minor merge of newer, trivial SSA functions.
Introduces LLAgent functions: addParcelChangedCallback and canJoinGroups
Support for secondlife:///app/appearance SLapps.
Cleans up older functions.
2014-09-04 17:32:03 -04:00
Shyotl
e975e389df Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
Conflicts:
	indra/newview/llnetmap.cpp
2014-08-05 18:17:13 -05:00
Inusaito Sayori
3656cb9fdb MAINT-4001 : Make Received Items not movable (protected), consolidate Received Items folders which may have been moved
Work by Merov Linden.
2014-06-18 08:05:49 -04:00