Commit Graph

4919 Commits

Author SHA1 Message Date
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
7a88b9a8a4 Fix the issue reported in group chat in which closing preferences with Device Settings open does not return to local voice 2013-06-23 22:16:40 -04:00
Lirusaito
64bd7af0ca Update childSetCommitCallback to upstream version, fixes the issue of crashing out upon using spinners in the colorpicker 2013-06-23 22:14:35 -04:00
Lirusaito
64cb1109e2 Update/Modernize LLFloaterColorPicker
Not very important, just something I did while working on the related spinner bug..
This actually fixed the crash when using the hex editor field.
2013-06-23 19:07:27 -04:00
Lirusaito
9f3c4e909a Removed the need for LLPanelAvatarNotes::onCommitNotes with a bind 2013-06-23 19:01:39 -04:00
Lirusaito
b4f0b29035 Switched the Ascent Prefs callbacks over to modern boost::bind
It's simple to compile fix, but I'll handle any necessary merge conflicts, if necessary.
Hunspell stuff needs revisiting still, works as poorly as it always did.
2013-06-23 19:00:49 -04:00
Aleric Inglewood
af9018f35f Add AIPerService::CapabilityType::mConcurrectConnections
Prepares for throttling number of connections per capability type.
The value is current left at AIPerService::mConcurrectConnections,
so not having an effect yet.
2013-06-23 18:09:09 +02:00
Aleric Inglewood
87176418a2 Change CurlConcurrentConnectionsPerService to U16 and clamp it between 1 and 32.
Also fixes a bug where going from 1 to 2 would not update
AIPerService::mConcurrectConnections correctly.
2013-06-23 18:05:23 +02: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
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
Aleric Inglewood
ee59617c5e Always add new http requests to the back the queue. 2013-06-22 22:20:37 +02:00
Aleric Inglewood
8a825c4228 Merge remote-tracking branch 'singu/master' 2013-06-22 20:09:45 +02:00
Aleric Inglewood
432d6b5697 More comment fixes to refer to services instead of hostnames. 2013-06-22 20:08:15 +02:00
Drake Arconis
dde335da2d Fix button misalignment in gemini skin 2013-06-21 03:23:53 -04:00
Drake Arconis
43a7cbaa85 Rip out the globals :D 2013-06-21 03:23:52 -04: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
57ba76825c Made LLPanel::initPanelXML virtual and override it in LLLayoutPanel. Fixes issue with some panels /still/ being user resizeable if derived from LLLayoutPanel and built from an arbiturary sub-xml file. 2013-06-20 00:55:07 -05:00
Shyotl
f24fe44df8 wlfPanel_AdvSettings cleanup. Removed some duplicate code, and register to rlv to catch behavior change instead of polling every draw call. Also now references wlfAdvSettingsPopup setting only during build. 2013-06-20 00:49:02 -05:00
Shyotl
e015771c64 Pulled llnotifications.h dependency from LLFloater. llnotifications.h includes llevents.h, which can cause conflicts with llevent.h (Legacy events vs non-legacy) 2013-06-20 00:45:12 -05: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
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
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
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
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
Shyotl
884c67e641 Added LLViewDrawContext. Implemented in a few select ui elements. Just enough to support the panel prim media controller fading out all fancy-like. 2013-06-16 22:48:50 -05:00
Shyotl
10f61f6f00 Old habits die hard. Fix gcc compile. 2013-06-16 22:45:48 -05:00
Shyotl
d4f5c25612 Fix up some of the broken SLURL<->HippoGridManager logic. 2013-06-16 21:47:55 -05: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
Shyotl
be94087bee Fixed a focus issue that prevented face media floater from updating on face change if said floater had current focus. 2013-06-15 20:08:05 -05: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