Commit Graph

4571 Commits

Author SHA1 Message Date
Aleric Inglewood
6ee1bf3fae Merge remote-tracking branch 'singu/master' 2013-07-02 02:13:03 +02:00
Aleric Inglewood
59716ba86b Added progress meter in HTTP debug console. 2013-07-02 02:12:34 +02:00
Aleric Inglewood
0353498b9c Set CURLOPT_FORBID_REUSE for XMLRPCResponder
XMLRPCResponder is used to login, which is a HTTP 1.0 server
that doesn't support reuse of connections.
It's cleaner to close connections from our side too.

This changes,
0x7fffdcf93700   CURLIO      0x7fffcd86db40   * Connection #0 to host login.agni.lindenlab.com left intact
into
0x7fffdcf93700   CURLIO      0x7fffcd8b0bd0   * Closing connection #0
2013-07-01 15:44:47 +02:00
Aleric Inglewood
982921e495 Add AICurlTimer - timer support for the curl thread.
Not used yet. Deliberately not threadsafe.
Usage the same as AIFrameTimer, upon which is was based.
2013-07-01 15:41:44 +02:00
Latif Khalifa
0e159e47cd Merge remote-tracking branch 'shyotl/master' 2013-06-28 23:18:39 +02:00
Shyotl
8ccf3a20b3 Fix crash that would happen upon revealing then closing the wl pref panel and then overriding region windlight settings. 2013-06-28 16:11:54 -05:00
Shyotl
8bca439a5a Fixed layout_panel being incorrectly resizeable in browser floater, and made layout_panel width more consistent in panel_progress.xml 2013-06-28 14:39:13 -05:00
Lirusaito
cf189beb86 Update French vanity preferences and put a name in for a checkbox I'd forgotten to name, thanks Nomade~ 2013-06-28 09:12:23 -04:00
Lirusaito
6f701c413a Remove the makeshift visibility_control from llprefsvoice.cpp in favor of using a real one 2013-06-28 08:25:13 -04:00
Lirusaito
b1abffbce1 Address Issue 879: Ability to copy Group URI
Spanish Button Translation from Firestorm
Also: Realigned includes in llpanelgroup.cpp to diff nicer with upstream
2013-06-28 08:22:30 -04:00
Lirusaito
9bdbf6b987 French Translation positioning fix-up from Nomade Zhao 2013-06-28 07:22:05 -04:00
Lirusaito
b7c4532766 Solve Issue 521: Web profile support
Adds a checkbox "Use web profiles instead of legacy v1 profiles" to System->General preferences
Adds a button "Web Profile" to the first life tab of legacy profiles (only available on grids that provide a web profile url)

When connecting to an OSGrid, always set the WebProfileURL setting to whatever is in web_profile_url, this way we know if web profiles are not supported.

Borrowed translations of the preference checkbox from Firestorm, translators may want to tweak
Translators may want to update panel_avatar.xml as it now has a web profile button, and contents have shifted slightly.
2013-06-28 07:18:59 -04:00
Latif Khalifa
5cea153542 Consolidate prebuilt libs 2013-06-28 05:49:29 +02:00
Latif Khalifa
34dad3ba04 Merge remote-tracking branch 'shyotl/master' 2013-06-28 05:48:46 +02:00
Shyotl
eab05d49d8 Added [in]visibility_control support. 2013-06-27 22:08:17 -05:00
Shyotl
93ca5d3482 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap
Conflicts:
	indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
2013-06-27 22:07:31 -05:00
Shyotl
dbf8845834 Fixup active speakers floater 2013-06-27 20:21:32 -05:00
Shyotl
54bf2943be Use proper list column when when generating teleport url from teleport history list. 2013-06-27 20:11:34 -05:00
Lirusaito
de97a7c9f7 Add floater_media_settings.xml to translations, and fix its title to fit in with the other floater titles 2013-06-27 18:58:01 -04:00
Latif Khalifa
321a7ffbd4 Merge remote-tracking branch 'aleric/master' 2013-06-28 00:12:57 +02:00
Lirusaito
a31316f46a By default, retain the expected behavior of not showing quick settings expanded 2013-06-27 18:11:54 -04:00
Aleric Inglewood
33e275c999 Temporary hack to easy the mesh connect timeout problem. 2013-06-28 00:09:10 +02:00
Aleric Inglewood
f74ad5eafa Fix global connection threshold not to count non-approved queued request as being in the pipeline.
This make more sense when comparing the threshold against 2 times the
maximum allowed total connections.

As a result, textures won't stall when there are around 128 mesh
requests queued.
2013-06-28 00:09:10 +02:00
Aleric Inglewood
73ea6eb80e Rewrite of AIPerService::add_queued_to
This should fix any 'stalls' with zero added requests for mesh.
2013-06-28 00:09:09 +02:00
Latif Khalifa
7855071ce8 Merge remote-tracking branch 'lirusaito/VoiceUpdate' 2013-06-27 23:31:46 +02:00
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
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
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
Aleric Inglewood
32681403c6 Fixed a typo: mConcurrectConnections -> mConcurrentConnections
That's what you get for only copy&pasting variable names.
2013-06-26 13:23:10 +02: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
32dc35d582 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/lloverlaybar.cpp - Shyotl did some caching, VoiceUpdate turned LLVoiceClient::voiceEnabled non-static.
	indra/newview/llvoiceclient.cpp - Change actually belongs in llvoicevivox.cpp
2013-06-26 04:43:46 -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
Shyotl
84d76f437f Toggle chat_bars parent layout panel instead of the actual chat bar. Fixes layout stack collapse not working. Also, cache a few more things in LLOverlayBar (reduces per-frame setting lookups, etc). Also added debug rect drawing for layout_stack/layout_panel. 2013-06-26 02:14:13 -05:00
Lirusaito
5aaea47a81 Removed setCallbackUserData calls from the last few newview files 2013-06-25 23:54:09 -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
306df58793 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-24 14:22:36 -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