Commit Graph

998 Commits

Author SHA1 Message Date
Latif Khalifa
7855071ce8 Merge remote-tracking branch 'lirusaito/VoiceUpdate' 2013-06-27 23:31:46 +02:00
Lirusaito
e07581f14d Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-06-27 06:00:21 -04:00
Drake Arconis
258d39e432 Coffee time. 2013-06-27 05:57:36 -04:00
Drake Arconis
d00fca05e9 Cleanup from review 2013-06-27 05:39:04 -04:00
Lirusaito
198091c2a0 Solve Issue 738: Improve .anim upload floater 2013-06-27 02:31:42 -04:00
Lirusaito
19367b517c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
Conflicts:
	indra/llui/lluictrl.cpp - Silly mergestuffs
	indra/newview/llfloatermediabrowser.cpp - deleted
	indra/newview/llpanellogin.cpp - updated functions went poof

Compile Fixies:
	indra/newview/llfloaterwater.cpp - I missed a spot with notificationsutil, it seems.
2013-06-26 12:37:31 -04:00
Lirusaito
14736d24a5 Update LLFloaterWater and LLFloaterWindLight, to be closer to their upstream counterparts. 2013-06-26 09:07:34 -04:00
Lirusaito
5a9a0e0b1b Upload code cleansing
I found our upload classes were in need of a tune up while researching Issue 896: Animation upload setting causes viewer crash
So I started working to clean up llfloaterbvhpreview which lead me to llfloaternamedesc and the rest of our upload floaters
I ended up pulling the sound upload hack out of LLFloaterNameDesc and into LLFloaterSoundPreview and moving LLFloaterAnimPreview into llfloaternamedesc.*
Updated llviewermenufile.cpp a bit
Removed setUploadAmount from LLFloaterImagePreview and LLFloaterBvhPreview as its purpose is served by LLGlobalEconomy::getPriceUpload and the hippogridmanager too.
Fixed an issue with floater_animation_anim_preview.xml using [AMOUNT] instead of [UPLOADFEE] for its label.

I'd say this might fix Issue 896, I certainly can't reproduce the crash I was having when testing for it anymore.
2013-06-26 03:51:27 -04:00
Lirusaito
139a10e77c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llpanelface.* -Knew these would conflict just from proximity
2013-06-25 23:49:04 -04:00
Lirusaito
8fb8e74e54 Fix the crash upon hitting select for an object's light color feature
Modernizes LLTextureControl(, LLFloaterTexturePicker) and LLColorSwatch
Updates LLPanelVolume, LLPanelObject, and LLPanelFace to prevent related crashes and compile.

Adds translation string InventoryNoTexture to strings.xml (added to all existing translations from upstream translation)
2013-06-25 23:02:15 -04:00
Lirusaito
c2cc398339 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
2013-06-25 19:37:50 -04:00
Shyotl
2793ca9e04 Applied moap beacon patch. 2013-06-25 16:21:51 -05:00
Shyotl
e011517849 Widen login/teleport progress bar. Fixed toolbar/overlaybar appearing over login progressview. Updated progressview a bit. Added drawcontext alpha support to llprogressbar. Fixed issue with prim media control panel blocking mouseclicks on upper portion of on-prim media. 2013-06-25 10:29:48 -05:00
Lirusaito
45bbf52771 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 22:36:55 -04:00
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
e7669cc94b Add setting to prevent script errors from stealing focus 2013-06-23 04:05:25 -04:00
Lirusaito
d4bed6382c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 02:25:15 -04:00
Shyotl
67df523f10 LLChatBar can't betreated as a LLPanel and a LLLayoutPanel at the same time. Demoted to just an LLPanel (fixes issues with follow attribute). 2013-06-22 17:27:09 -05:00
Drake Arconis
7a0e3d8abd Remove more old stuff 2013-06-21 03:23:51 -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
Shyotl
3f1e67d9df Added LLMediaCtrl rightclick context menu. Also added some v3-esque xml handling for menus (*.on_visible, *.on_enable, *.on_click). 2013-06-20 03:15:42 -05:00
Shyotl
8d0a514712 Added missing setting. Fixed login grid combobox. Using skin-dependent scrolllist text color in nearbymedia panel. Fixed media face toggle not triggering face rebuild. Added incon that was missed in previous commits. bar_stack layout panels were incorrectly resizeable. Fixed comboboxes/scrolllists in panel_nearby_media.xml translations 2013-06-19 03:32:33 -05:00
Shyotl
49cbc80ee0 Added 'NearbyMedia' floater (accessable via new button in Media Remote popup)
-Floater utilizes a slightly modified LLPanelNearbyMedia, which has fading and the 'minimal' mode disabled when its parent is a floater.

  -Due to how LL designed LLPanelNearbyMedia, only one instance should ever be allowed at a time.

Added LLNameBox. To avoid having dupilcate code, logic in LLTextBox::fromXML had to be moved to LLTextBox::initFromXML.

  -Perfomed some additional cleanup. 'name' attribute now parsed in LLUICtrl::initFromXML, or as-needed for elements not based off of LLUICtrl.

LLSlider now respects current DrawContext

Fixed the AO toolbar widget reserving too much width.

Made the "wlfAdvSettingsPopup" setting persist, and un-inverted its logic.

Altered ui initilization order. Toolbar/overlay panels now constructed further into login process.
2013-06-18 08:09:17 -05: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
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
Shyotl
ad89c3e401 Added media support to prim face editor. Todo: Translations for all these floaters and panels. 2013-06-15 05:14:27 -05: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
Shyotl
5f4091b4d2 Update LLFloaterTools to use commit callback registrar where convenient. 2013-06-14 03:55:40 -05: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
Shyotl
e617ff0763 New LLLayoutStack, and cursory LLPanelPrimMediaControl panel. 2013-06-13 04:28:15 -05:00
Lirusaito
01ec6905ab [Voice Update] LLFloaterVoiceEffect (Lives in File->Show Voice Morpher for now) 2013-06-13 05:23:35 -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
c8657504f6 Fix WARNING: LLNotificationTemplates::addTemplate: LLNotifications -- attempted to add template 'LandBuyAccessBlocked' twice. 2013-06-10 11:49:03 -04:00
Lirusaito
c273e34ed8 [Voice Update] LLVoiceClient
Migrate a bunch of classes out of llvoiceclient.* and into new llvoicevivox.*
Update most of these to match their counterparts
Introduce VoiceFonts support (voice morphing, floater still to come)
Support for a bunch of v3 voice settings.
Move volume settings management from LLMutelist into LLSpeakerVolumeStorage
Support for Avaline mutes (WIP)
Adds voice section to LLAgent
Moved llfloatervoicedevicesettings to llpanelvoicedevicesettings, v3's voice device panel design is more intuitive.
2013-06-03 22:20:27 -04:00
Shyotl
9c8cfcfd0a Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent). 2013-06-02 23:47:47 -05:00
Shyotl
d4a545fb16 More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs. 2013-06-01 05:11:18 -05:00
Lirusaito
fcd6f217d2 LLGroupActions too! (Strengthens RLVa restrictions!)
Cleans up llfloatergroupinfo, makes it an instance tracker... pretty much as nice as llfloateravatarinfo now ^*^
Adds notifications JoinGroupNoCost and JoinedTooManyGroups (added to our existing translations, of course)
Cleans up all around, placing groupactions around.

Touches up bits for avataractions
2013-05-31 07:37:00 -04:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Lirusaito
dc4a52e1c4 Added Delete System Folder entry to xmls, it won't work on release builds, of course. 2013-05-30 18:30:06 -04:00
Lirusaito
f3f76c280b [Issue 850] Add a control for unfocused window opacity.
Adds debug setting FloaterUnfocusedBackgroundOpaque
Adds "Make unfocused floaters opaque" to Vanity->Main preferences.

One line patch to llfloater.cpp
2013-05-30 18:28:36 -04:00
Lirusaito
a395e2f1b9 Removed the profile tab container gap. 2013-05-30 17:02:56 -04:00
Lirusaito
c701c61566 LLAvatarActions all hooked up!
Rlva style~ So update to RLVa stuff!
Adds support for @startim and @startimto
Enables hasOpenIM and hasOpenProfile, Yay functionality!
RLV_BHVR_STARTIM and RLV_BHVR_STARTIMTO added

While I was working, I was updating LLAgentHandler, after long enough it was identical enough to the one in llpanelprofile, so we're using that now.
Cleans up llfloateravatarinfo to the point of being a floater and instancetracker wrapper for a panelavatar (profile panel)
Bypasses looking up expired names that we know via get, this should avoid chats (and profiles, but that bug never got out) never opening for people we already know the name of on a bad connection; of course, this will only cause a faster reaction on the UI's part, messages may never get sent still (and profiles may never load) if the connection is truly terrible.
Cleans up llfloaterfriends and some parts of llfloateravatarlist (avatarlist could be cleaned up more from this perhaps in the future)
May slightly look better with copy detection and without space changes..

llgivemoney.cpp changes fix up some dummy view warnings I noticed while testing these changes
llpreview.cpp changes avoid segfault caused by llfloateravatarinfo not being a preview anymore but being inside a multipreview nonetheless.

Translators, don't worry, I covered this one with updates from v3 (Except German team)
2013-05-29 23:56:33 -04:00
Lirusaito
4eae554812 Merge branch 'UICleanup' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/llappearance/llwearable.h
	indra/llui/llcombobox.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llpanelgrouproles.cpp
	indra/newview/llpanelgrouproles.h
	indra/newview/llviewermenu.cpp - Plugged in new MenuFloaterDict for AssetBlacklist and SoundExplorer in menu_viewer.xml and removed the old listeners for them.
	indra/newview/skins/default/xui/es/floater_inventory.xml
Compile Fixes:
	indra/llcommon/llstl.h - error: expected nested-name-specifier before ‘const’
	indra/llui/llmultisliderctrl.cpp:283:12: error: ‘caller’ was not declared in this scope
	indra/llui/lltexteditor.cpp
		- error: operands to ?: have different types ‘const LLPointer<LLTextSegment>’ and ‘long int’
		- error: passing ‘const LLPointer<LLTextSegment>’ as ‘this’ argument of ‘LLPointer<Type>& LLPointer<Type>::operator=(const LLPointer<Type>&) [with Type = LLTextSegment]’ discards qualifiers
	indra/newview/llfloaterpermissionsmgr.cpp - Silly Shyotl, boost bind, not std bind.
	indra/newview/llfloaterproperties.* - error: ‘LLInstanceTracker<LLFloaterProperties, LLUUID>’ is an inaccessible base of ‘LLFloaterProperties’
	indra/newview/llgivemoney.cpp - Again, boost::ref, not std::ref
	indra/newview/llpreviewscript.cpp - no known conversion for argument 1 from ‘std::vector<const LLPointer<LLTextSegment> >’ to ‘std::vector<LLPointer<LLTextSegment> >&
2013-05-27 08:09:28 -04:00
Lirusaito
a10708e9be Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-05-27 04:07:38 -04:00
Lirusaito
8769b98b31 Add Bottom offset spinner to the Chat Console section of Text Chat prefs, thanks Ratany! 2013-05-27 03:08:09 -04:00