Commit Graph

4488 Commits

Author SHA1 Message Date
Lirusaito
3739639295 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
	indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.

Compile fixies:
	indra/newview/llavataractions.cpp needed to include llnotifications.h
	indra/newview/llvoicechannel.cpp needed to include llnotifications.h
2013-06-23 22:36:04 -04:00
Lirusaito
498b63be99 Revert "Fix the issue reported by Beware Hax in which the group name text is missing from build floater."
This reverts commit 142e8fff19.
Shyotl fixed this in Moap, which I am about to merge.
2013-06-23 04:25:55 -04:00
Lirusaito
d4bed6382c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 02:25:15 -04:00
Lirusaito
62f5e73767 Copypasta went stale, I had to throw it out.
This commit removes the hardcoded see avatars text that replaced the label of the checkbox on the about land floater regardless of conditions.
Also adds the checkbox translation from v3 for Portuguese.
2013-06-20 22:43:41 -04:00
Latif Khalifa
788ea1316f Fix build on arch where python 3 is default
Patch by Jimmy Buse
2013-06-20 02:59:04 +02:00
Latif Khalifa
ca42589a82 SH-4274 FIX Adding RegionHandshakeReply flags for SSA
Adding a flag to hint to the sim that this viewer knows how to handle
AvatarAppearance messages for self in SSA-enabled regions.

Upstream patch: 5fdc790f6d
2013-06-19 17:37:40 +02:00
Latif Khalifa
859ad8efd8 Merge remote-tracking branch 'melanie_t/master' 2013-06-19 16:57:28 +02:00
Melanie
94cfa613ec Rename inner scope floater var to satisfy MSVC 2013-06-19 16:54:41 +02:00
Melanie
76219cd459 Fix the Octopus to hold on to connections and to disconnect them using boost rather than setting a zero callback. 2013-06-19 16:08:47 +02:00
Lirusaito
2c1f14e27f AscentMutedColor is not in gColors, it's a setting, oops. Thanks to LaMont Zuzu for helping me sort this all out.
Fixes muting people who are/having muted people who are in a participant list(active speakers or that << pop out in group chats) that is displayed
2013-06-18 21:01:11 -04:00
Lirusaito
3116e4923c Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-06-18 01:18:28 -04:00
Lirusaito
12a23c98a1 Fix Issue 459: Appearance, Create Outfit does not keep edits to outfit - HAPPENS EVERY TIME
Automatically detach copyable attachments early, so that changes will be kept (LLMakeOutfitDialog was changed to update the outfit correctly, despite items being removed. It should probably be cleaned up further)
Adds an extra checkbox to make outfit dialog to disable this new auto-detach behavior, for users who rely on the old behavior.

Also fixes a bug I noticed in LLMakeOutfitDialog in which the use links checkbox would be enabled even if the grid doesn't support links
Had to reposition everything to get the new checkbox to sit nicely, but in doing so changed bottoms to bottom_deltas so it should be easier in the future, layout remains the same, of course, shouldn't be noticed.
2013-06-18 00:02:50 -04:00
Latif Khalifa
55ab1429af Merge remote-tracking branch 'aleric/master' 2013-06-18 03:34:07 +02:00
Latif Khalifa
4607ff1317 Merge remote-tracking branch 'lirusaito/master' 2013-06-18 03:33:55 +02:00
Lirusaito
4016c9d756 Silly profiles, display the proper title. 2013-06-17 12:37:22 -04:00
Aleric Inglewood
ff6e25b342 Compile fix 2013-06-17 17:59:39 +02:00
Lirusaito
f27f4a7d48 Minor LLViewerTextEditor update
Support for opening embedded calling cards
Switched to llnotificationsutil.h instead of llnotify.h
Cleaned up and reorganized includes list to better match upstream
Fixed embedded notecards not popping up when you click them, someone at LL decided new inventory should only be shown if the user doesn't want it to be shown for the case of embedded notecards.
2013-06-17 11:34:48 -04:00
Aleric Inglewood
1754b97e5c Need to export BackTrace::S_Number to use BACKTRACE. 2013-06-17 17:28:42 +02:00
Lirusaito
7303bfcb78 Eliminated most instances of the legacy setCallbackUserData (and modernized up a bunch of callbacks)
Also cleaned up slfloatermediafilter to act as a proper singleton.
Removes childSetUserData entirely.
2013-06-16 20:00:00 -04:00
Melanie
6025af25be Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-06-16 20:49:54 +02:00
Lirusaito
4fe2396203 Relicensed LLDropTarget to LGPL, since I've rewritten it. 2013-06-16 01:13:52 -04:00
Lirusaito
93ce490ba3 Forgot to update the search floaters used on alternate grids 2013-06-15 18:36:56 -04:00
Lirusaito
657d3f704c Add Open Picture button to Pick Panels (and Further LLPanelPick cleanup) 2013-06-15 18:34:14 -04:00
Lirusaito
c5d21cfb1c Updated pick panel code, removed dead stuff including xmls. 2013-06-15 06:10:31 -04:00
Lirusaito
8ce71811c5 Feature Request (from IRC): Allow less restrictive access to group profiles from search
mAllowEdit has really signified whether or not llpanelgroup was in its own standalone floater
This change removes the restrictions the lindens chose to put on group search, allowing the user as much control as possible over a group from outside a dedicated floater

Notices and Land & Money get their information from messages passed through viewermessage, addressed to the right instance by id, as such they must be unique to the standalone floater
Cancel button in group search will only enable when changes have been made and will refresh the group, clearing changes.
The OK button is not visible in group search as it serves the same purpose as the Apply button here.
2013-06-14 23:08:56 -04:00
Lirusaito
cf675c3748 Feature Request (from IRC): Add option to display complete name on profile (Available on Vanity Preferences at the bottom of the main tab)
Note: This will not work with legacy names selected because that disables the display name system altogether right now, if we ever separate the disabling to another setting, this would work.
2013-06-14 22:04:27 -04:00
Lirusaito
35bcf34f06 Removing unused panel_group_finder.xml, looks like some ancient version of panel_group.xml 2013-06-14 14:49:24 -04:00
Latif Khalifa
8574f1ee23 Merge remote-tracking branch 'aleric/master' 2013-06-14 18:31:48 +02:00
Latif Khalifa
a6a5983fbe Merge remote-tracking branch 'lirusaito/master' 2013-06-14 18:31:35 +02:00
Latif Khalifa
4552c5f878 Merge remote-tracking branch 'melanie_t/master' 2013-06-14 18:31:23 +02:00
Lirusaito
c8427e1c63 [Voice Update] Remove old xmls from back when the voice setup wizard was a thing 2013-06-13 08:56:12 -04:00
Lirusaito
2d71b9be17 [Voice Update] LLPanelVoiceEffect added to LLFloaterActiveSpeakers
Comments out xml menu entry for LLFloaterVoiceEffect access from LLPanelVoiceEffect is the intended method
TODO: Once Shyotl's new layout stack code comes in, make LLFloaterActiveSpeakers into a vertical stack so we can properly hide LLPanelVoiceEffect upon a debug setting.
2013-06-13 06:29:00 -04:00
Lirusaito
01ec6905ab [Voice Update] LLFloaterVoiceEffect (Lives in File->Show Voice Morpher for now) 2013-06-13 05:23:35 -04:00
Aleric Inglewood
34b921a101 Disable llassert(!mUploadFinished)
This fires so little that it isn't worth anymore to look into it
(the only problem resulting from this is a wrong timeout on one
of the http requests); and therefore no longer makes sense to
have it triggered in alpha builds at all, since those do not
produce enough debug output to understand what caused it in the
first place.
2013-06-12 21:21:41 +02:00
Aleric Inglewood
af1eaac79d Bug fix.
Revert an incorrect change made in
c5fc945f33 (imported from viewer 3).

This stops ASSERT(mSegments.back()->getEnd() == getLength())
in LLTextEditor::loadKeywords.
2013-06-12 14:55:46 +02:00
Aleric Inglewood
def40055b0 Don't add windows filesname to service list. 2013-06-12 03:10:11 +02:00
Lirusaito
08ab202a06 Fix avatar "inspect" commandhandler 2013-06-11 19:03:15 -04:00
Lirusaito
b7136b2b4f [Voice Update] startCall and endCall use Session UUID, not Other Participant UUID. 2013-06-11 16:59:32 -04:00
Lirusaito
7e9c75ef6b Use the translatable string Saved_message everywhere needed, instead of just one place. 2013-06-11 15:43:27 -04:00
Lirusaito
d947912bb0 [Voice Update] Start/End call functions
Adds llvoicecallhandler.cpp
Enables the Group and Avatar Actions requiring the voice refactor.
Adds autoStartCallOnStartup, processAgentListUpdates, startCall, and endCall to LLIMMgr.
Gives llimpanel some LLIMModel functionality to see if a floater was opened with the intent of being a call.
Cleans up LLIMPanel with new functions from the voice refactor.
2013-06-11 15:41:53 -04:00
Lirusaito
fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp
2013-06-11 15:32:18 -04:00
Lirusaito
9ffd531ce6 Missed a spot 2013-06-11 09:41:33 -04:00
Lirusaito
8a37ac2439 class LLOfferInfo update 2013-06-11 07:36:49 -04:00
Lirusaito
62a96b8b33 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into VoiceUpdate 2013-06-11 05:56:24 -04:00
Lirusaito
c8657504f6 Fix WARNING: LLNotificationTemplates::addTemplate: LLNotifications -- attempted to add template 'LandBuyAccessBlocked' twice. 2013-06-10 11:49:03 -04:00
Aleric Inglewood
aca39d8c11 Fix crash when granting/removing build rights to others.
Bug was introduced in c701c61566
for single persons, but already existed for when granting rights
to more than one person at a time.

There is still a problem left now that you have to confirm
several times (once, but also had to confirm two or three times)
before it gets through. That doesn't seem related to THIS bug,
but seems to be a new bug, possibly introduced in the same commit
mentioned above.
2013-06-10 16:07:45 +02:00
Lirusaito
cc107c55cd [Voice Update] Fix the current voice chat button
If the current voice chat's floater is undocked, grab it by session id so that it's not labeled blank
When the button is clicked, open the current voice chat floater, not the communications floater, this is the intended action.. how it should have acted in the first place.
2013-06-09 11:32:51 -04:00
Lirusaito
cbfa47c0da [Voice Update] LLPanelActiveSpeakers to LLParticipantList
Minor updates to code, mostly just a migration with some v3 stuff commented, since we don't have LLAvatarList and must use buttons since scrolllist menus don't actually exist nicely yet.
Added toggleMuteVoice and isVoiceMuted to LLAvatarActions
Added a minor touch to the voice volume slider, it'll now offer changing your own volume while in an active voice session.. nice to not drop out of an import voice session just to fix yourself.

Also, fix a bug with SpeakerMgr's not flagging speakers for removal properly, causing external speakers and speakers managed by LLActiveSpeakerMgr to never actually get removed.
2013-06-09 11:28:49 -04:00
Aleric Inglewood
e59cefa0cc Bug fix of LLPipeline::setRenderDebugFeatureControl
This commit has no effect on how the viewer behaves currently.
2013-06-07 16:19:46 +02:00
Shyotl
72c186f0f4 Fixed some unused variable warnings/errors when not compiling with assertions enabled. (eg 'release' configuration). Also snagged a nullcheck from upstream. 2013-06-06 02:12:45 -05:00