Commit Graph

276 Commits

Author SHA1 Message Date
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
Lirusaito
a6e08bfc0f Try to do opensim login stuff if not secondlife, not just if opensim/wc 2019-03-17 19:26:25 -04:00
Shyotl
b81373366b Animesh test changes. Also stop screwing with my commit messages, github. 2019-03-17 02:35:07 -05:00
Lirusaito
7acce90927 Clean up 2019-03-09 15:40:35 -05:00
Lirusaito
324f12641a Remove redundant casts from c_str to string
Thanks Aru
2019-03-06 16:11:42 -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
Lirusaito
45c7c711ad You need to wake upYou need to wake upYou need to wake upYou need to wake up
YouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUp
ouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpY
uNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYo
NeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYou
eedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouN
edToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNe
dToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNee
ToWakeUpYouNeedToWakeUpNeedWAKEUPNeedYouNeedYouWakeUpYouNeed
oWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedT
WakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedTo
akeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToW
keUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWa
eUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWak
UpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWake
pYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeU

[~~~~~~~~~~~~~~~~~~~~~~~~~~WakeUp~~~~~~~~~~~~~~~~~~~~~~~~~~]
2019-02-03 12:31:36 -05:00
Lirusaito
dc96269bc6 Do not grab focus during login, seriously uncool. 2019-02-02 18:39:33 -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
Inusaito Sayori
167d336274 Up to compile phase
at 20fd3e98b4
2019-01-25 19:32:15 -05:00
Lirusaito
0c8f2f1ea0 Cleanup and add back an opt in text editor 2019-01-18 02:14:31 -05: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
Shyotl
2dc46964b4 Simple update check mechanism, and tons of notification tweaking to make the notifications look less crap. 2018-02-08 01:26:09 -06:00
Lirusaito
563f252dc1 Set AgentAppearanceServiceURL properly on login (fixes misplaced }) 2016-06-14 04:00:33 -04:00
Lirusaito
f33429f1bb Buncha pointless sync and cleanup 2016-05-27 12:17:30 -04:00
Lirusaito
4bfd4b38bc Aaaand more, this time for llagentwearables.cpp 2016-05-26 11:51:49 -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
Shyotl
691a5395ca llmessage merge and further LLUnit usage. 2016-04-07 20:17:30 -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
Shyotl
3f3ead0988 Merge branch 'master' into AISv3-WIP
Conflicts:
	indra/newview/llinventorybridge.cpp
2015-06-27 01:30:28 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -05:00
Inusaito Sayori
b11511b7b9 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
2015-06-19 05:42:49 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Inusaito Sayori
b35d1b7005 Accept and respect Opensim's login response with "classified_fee" (otherwise assume 0 for opensim) 2015-06-10 13:47:06 -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
dd4f2e857b If we're gonna autologin, remember name too. 2015-01-13 00:52:27 -05:00
Inusaito Sayori
a29b50b4cd Fix crash signature 86
Cleans up a buncha lame code in llpanellogin.cpp
Removes some static silliness from the old days.
Removes RememberLogin because RememberName serves its purpose.
Stylistic fixups~
Removes some pointless functions.
2014-12-30 16:49:40 -05:00
Inusaito Sayori
0e48a2196f Update/Modernize LLAvatarName and LLAvatarNameCache and _EVERYTHING_ they touch
Fairly certain this adds the feature in which the user may click the online notification to open a chat with the user coming online.

Translators may want to look at the xml changes of this change to see what to update

Removes old LegacyMultiAttachmentSupport patch
Moves LLAvatarName-centric functions into LLAvatarName from elsewhere.
Adds boost::signals2::connections to name polling places.
Removes more old icky static callbacks
Merge from Alchemy, credit where due~
Update notifications.xml to have a bunch of the tags from upstream to ease diffing
2014-12-16 17:55:23 -05:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Drake Arconis
90d2dce07a Add FMOD Studio support 2014-08-10 17:41:10 -04:00
Inusaito Sayori
b3590c5ae6 Add Default Avatar Picker Floater (World->Default Avatars)
Default Avatars button option added to Toolbar prefs.
Adds debug setting ToolbarVisibleAvatar
Hooks into "avatar_picker_url" login response on opensim.
Also includes hooking up of DestinationGuideShown to startup, which was left unstaged from the initial commit of the Destination Guide.
2014-07-31 14:45:27 -04:00
Inusaito Sayori
ce265b3948 Add Destination Guide
Adds llfloaterdestinations.* and floater_destinations.xml (needs translations, but not really)
Adds GenericErrorPageURL, DestinationGuideURL (not persistent), DestinationGuideShown, and DestinationGuideRect to debug settings
Removes ShowcaseURLDefault in favor of DestinationGuideURL from upstream.
Also Adds ToolbarVisibleDestinations for the toolbar button, but I'll need to set up a nice way to make the button invisible when the url is empty before adding it to the gui... maybe.. or maybe it's just not important.

This commit comes with support for dynamically changing destination guide page based on opensimextras simulator features cap
2014-07-31 10:07:11 -04:00
Inusaito Sayori
7fee70543d Login Response support for destination_guide_url, OpenSimExtras support (properly) search-server-url, and support the new destination-guide-url from OpenSimExtras
Expands SignaledType's callback to accept const Type& as argument.
typedefs Signal::slot_type to slot_t so that SignaledType can be altered without needing to update all lines setting slots.

Merges floater_directory.xml with floater_directory(2|3).xml
Condenses translations down to one xml(, finally the nightmare is over).
Better ui code support for classic find all panel
Not like anyone cares, but ShowcaseURLDefault no longer persists value changes between sessions.

Moves SearchType and getSearchUrl(SearchType ty, bool is_web) from HippoGridInfo into a namespace in llpaneldirfind.cpp, the only place where it is used; so that it may wrap the sim feature lookup.

Thanks to Shyotl for the help in dynamically maintaining tab positions for dynamic tabs.
2014-07-31 08:12:00 -04:00
Cinder
402cd21f87 Hi. 2014-07-21 14:49:33 -04:00
Cinder
73d8cedf7e A few changes after code review from Liru 2014-07-21 14:49:18 -04:00
Cinder
45f5eb9671 Replace the media filter with something a little different 2014-07-21 14:48:57 -04:00
Lirusaito
811849fa23 Attempt to fix Issue 1154: Streaming Audio Display no longer stays enabled across relogs 2014-06-17 12:51:04 -04:00
Inusaito Sayori
1051fd9d42 Feature Request: Show how many scripts are actually running when doing a script count (also shows mono!) 2014-06-17 11:39:03 -04:00
Inusaito Sayori
7ea7d4cf6c Fix any and all crashes relating to initialization of UI components that may need the name cache to be initialized already. 2014-06-14 15:40:36 -04:00
Inusaito Sayori
eebee9b7c1 [STORM-68b] Default permissions floater overhaul
Adds separated default permissions for Objects, Uploads, Scripts, Notecards, Gestures and Wearables.

Compatible with Export Permission
Backwards compatible with default permissions for objects on regions where AgentPreferences capability is not available (opensim users rejoice!)

These changes to llfloaterperms are made available under lgpl, if there's a v3 that wants to adopt default export permission for opensim.
2014-06-14 15:32:50 -04:00
Inusaito Sayori
de2ce83a8d Touchups to namesystem update 2014-03-25 19:39:02 -04:00
Inusaito Sayori
af58636c7c Fix the Login Panel such that it persists until a successful login and maintains ui values between failed logins
When the login panel used to die, it now hides instead, we only truly kill it upon successful login.
Much of the opening and setting behaviors have been cleaned up to ensure fields are autofilled by the viewer without any user action once
Everything else like changing saved logins will still work the same.
2014-02-02 16:45:37 -05:00
Inusaito Sayori
06186e6c7e [VarRegions] Pseudosupport for region_size_y. 2013-11-06 15:53:15 -05:00
Shyotl
c1feb11d98 SH-3860. Cloud on first load issue. I'm sure the inaccessible jira has more details... 2013-10-26 18:56:39 -05:00
Latif Khalifa
cb12a35102 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/llaudio/llaudioengine.cpp
2013-10-12 10:04:05 +02:00
Shyotl
7fb05e6a48 Audio engine changes:
-Idle tick is now responsible for dispatching all pending sound sources, as such improves priority sorting.
-Added ui sound precache mechanisms (to fetch sounds without associated soundsources)
-Audio engine no logner available pre-login or upon disconnect, for simplicity.
-General cleanup to the audio engine/impl.
-Fixed some gAudiop calls that were lacking prerequisite null checks.
-Added 'isUpstreamOK' procuedure to LLAssetStorage to allow avoidance of making requests when there is no upstream host connection.
2013-10-12 02:49:11 -05:00