Commit Graph

4501 Commits

Author SHA1 Message Date
Lirusaito
f6a1371f70 Fix the issue with the doubleclick callback for the script compile errors list breaking when the user has opted not to let script errors steal focus 2013-06-27 17:27:55 -04:00
Lirusaito
fe238d0563 Delete all the fake toolbar icons in alternative skins
The proper way to hide toolbar icons is by falling back on the default skin's 1x1 transparent texture for them, not by making a a larger version of the icon and using that.
This should fix the awkwardly offset alignment of the text on the buttons in these skins
2013-06-27 13:51:43 -04: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
f6df34e40a Remove mCommitCallback, mValidateCallback, and mCallbackUserData and related functions from LLUICtrl and derived classes 2013-06-26 11:16:44 -04:00
Lirusaito
d7d5925fd1 And finally, update the callbacks on the last few panels to use boost
Cleans up LLPanelSkins enough to remove sInstance hack.
Modernizes some callbacks on wlfPanel
2013-06-26 11:14:32 -04:00
Lirusaito
14736d24a5 Update LLFloaterWater and LLFloaterWindLight, to be closer to their upstream counterparts. 2013-06-26 09:07:34 -04:00
Lirusaito
dbe646c943 Some minor tweaks to llfloaterpostprocess
Just to make it a little nicer and cleaner, a few changes are from upstream.
2013-06-26 05:32:57 -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
5aaea47a81 Removed setCallbackUserData calls from the last few newview files 2013-06-25 23:54:09 -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
Latif Khalifa
26aea5f16e Merge remote-tracking branch 'aleric/master' 2013-06-24 19:42:50 +02:00
Aleric Inglewood
58972a1f87 Bug fix and improvement (HTTP debug console) 2013-06-24 19:12:37 +02:00
Aleric Inglewood
1d04b4af24 Actually use CapabilityType::mConcurrentConnections for Approvements. 2013-06-24 18:57:42 +02:00
Aleric Inglewood
719f57e00d Fix documentation at top of AIPerService::approveHTTPRequestFor 2013-06-24 18:37:57 +02:00
Aleric Inglewood
6c36b6efa0 Add AIPerService::mCTInUse and AIPerService::mUsedCT
Keep track of which capability types are used and in use
at the moment for each service.

Update the http debug console to only show services
that have at least one capability type marked as used (this resets upon
restart of the debug console) and show previously used but currently
unused capability types in grey.

Update CapabilityType::mConcurrentConnections based on usage of the
capability type (CT): Each currently in-use CT gets an (approximate)
equal portion of the available number of connections, currently
unused CTs get 1 connection for future use, so that requests can and
will be added to them if they occur. If a CT is currently not in use
but was used before then it's connection (but at most one connection)
is kept in reserve. For example, if there are 8 connections available
and a service served textures and mesh in the past, but currently
there are no texture downloads, then mesh get at most 7 connections,
so that at all times there is a connection available for textures.
When one texture is added, both get 4 connections.
2013-06-24 16:13:00 +02: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
e7669cc94b Add setting to prevent script errors from stealing focus 2013-06-23 04:05:25 -04: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
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