Commit Graph

3084 Commits

Author SHA1 Message Date
Aleric Inglewood
524fdf033d Merge remote-tracking branch 'singu/master' 2013-03-26 21:10:00 +01:00
Aleric Inglewood
b20886a481 Allow TOS redirect. Fix upload finished detection when redirecting.
This fixes https://code.google.com/p/singularity-viewer/issues/detail?id=705

Adds 'bool redirect_status_ok(void) const { return true; }' to LLIamHere,
because it's ok to receive a 302 status there. Likewise added to LLIamHereVoice,
because that has the same comment in its error() method.

Also fixes the problem that if two redirects occur on a row, then the
upload_finished detection asserted because it would detect the third
time that libcurl turned off writing to the socket as a failure (the
second time wasn't a problem because mUploadFinished was reset upon
receiving the first 302 header, but not upon receiving the second
header).
2013-03-25 04:41:07 +01:00
Latif Khalifa
ea4f2ec7a7 Merge remote-tracking branch 'origin/sunshine2' 2013-03-24 14:23:18 +01:00
Latif Khalifa
afc137bb3f Merge remote-tracking branch 'aleric/master' 2013-03-24 14:22:28 +01:00
Aleric Inglewood
d526d388ef Make AIRegisteredStateMachines more robust.
Now that a call to cont() can schedule a run of the statemachine, we
need this change to make it robust (the comment that cont() does never
access mRegisteredStateMachines no longer holds).
2013-03-23 22:17:27 +01:00
Latif Khalifa
ef6549ce32 Set default network buffer size to 6000ms for music streaming 2013-03-22 22:43:31 +01:00
Latif Khalifa
f1cf73b8af Reverted addition of soon to be obsolete way of setting z offset to quick prefs 2013-03-22 22:40:37 +01:00
Latif Khalifa
40133643c0 Revert "SH-3941 SH-3954 FIX local appearance does not update properly"
This causes SUN-57

This reverts commit 707f3959f9.
2013-03-22 21:52:17 +01:00
Aleric Inglewood
835240fda1 Fix crash in LLTextureFetch::getWorker upon viewer exit.
This is now necessary since the curl thread no longer syncs with the
main thread: it is possible that a request finishes after a texture
fetch thread was shot down but before curl was stopped, and curl
calling BufferedCurlEasyRequest::processOutput while objects that the
responder uses were already destructed (most notably
LLTextureFetch itself).
2013-03-21 20:26:01 +01:00
Aleric Inglewood
00b223f2a4 Do not request empty folders.
Doing this resulted in a 404 on Aditi, and although that was a server
bug; it still doesn't seem to make much sense to do the request in the
first place.
2013-03-20 22:51:11 +01:00
Lirusaito
212faab988 Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting 2013-03-20 09:01:37 -04:00
Lirusaito
f87a967c0d Pathfinding UI: Fix the open with selection via pie menu bug.
Also comments out an unnecessary excess call.
2013-03-20 08:37:06 -04:00
Drake Arconis
5dd957f117 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into Cupcake 2013-03-20 08:31:21 -04:00
Drake Arconis
0eeddb0607 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake
Conflicts:
	indra/newview/llappviewer.cpp
2013-03-20 08:31:04 -04:00
Lirusaito
c2b3322594 Pathfinding UI: Hide Capsule doesn't seem to work without havok 2013-03-20 08:30:36 -04:00
Aleric Inglewood
06730d1a7e Fix recursive calls to LLWaterParamManager::initSingleton and LLWLParamManager::initSingleton 2013-03-19 22:44:01 +01:00
Aleric Inglewood
fc642019b3 Fix recursive call to LLNotifications::initSingleton 2013-03-19 19:56:20 +01:00
prep
7ef75fef4f Fix for sh-4014. This was a regression caused by fix for sh-3650. 2013-03-19 19:20:06 +01:00
prep
45e6c3f2e4 modified_cof_cb() issues a updateAppearanceFromCOF() right before this function - removed extra update call. Sh-3650 & Sh-3985 2013-03-19 19:19:17 +01:00
Nyx Linden
707f3959f9 SH-3941 SH-3954 FIX local appearance does not update properly
We were using an indicator of whether there *was* a baked texture to whether we
were *using* a baked texture. Switched to one of the (several) proper indicators
of whether a baked texture was in use. This should allow local texture data to
get marked for download when we enter appearance mode.

Local testing confirms that old apperances linger for a second or two, but are
soon replaced by the correct local renders.
2013-03-19 19:13:51 +01:00
Nyx Linden
554a03d569 SH-3649 WIP newly created pants do not show up on mac/windows.
Added an initializer for the wearable definition version when creating a new wearable.
Should fix the issue but need to test.
2013-03-19 02:20:58 +01:00
Nyx Linden
0866685971 SH-3954 SH-3941 SH-3910 FIX local appearance does not update
We suppress texture downloads for local textures not needed with server side
baking. We need to explicitly re-set texture priority for local textures
when entering appearance mode.
2013-03-19 02:20:17 +01:00
Brad Payne (Vir Linden)
bb528a4398 Periodic log messages to explain why user is still clouded, if they are 2013-03-19 02:19:53 +01:00
Brad Payne (Vir Linden)
4179730552 Increase number of retries for requestServerAppearanceUpdate() 2013-03-19 02:14:40 +01:00
Nyx Linden
07850410b5 SH-3909 Support avatar height offset
Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.

Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.

Conflicts:

	indra/newview/character/avatar_lad.xml
	indra/newview/llagent.cpp
	indra/newview/llcallingcard.cpp
	indra/newview/skins/default/xui/en/strings.xml
2013-03-19 02:06:22 +01:00
Lirusaito
b0459b08b6 Fix up a bunch more run-time UI warnings. 2013-03-14 05:24:10 -04:00
Drake Arconis
20cdb35172 Import some changes from internal 2013-03-12 06:03:06 -04:00
Drake Arconis
9bce5d479a Merge remote-tracking branch 'Lirusaito/master' into Cupcake 2013-03-12 01:47:14 -04:00
Lirusaito
655e0bc30d Apollo skin upkeep 2013-03-12 01:27:06 -04:00
Lirusaito
2ae966fe6b Strings fix ups
Order was a little incorrect
Minor change to hippogridmanager.cpp
2013-03-12 01:26:19 -04:00
Drake Arconis
e08f4316ab New lsl function added 2013-03-12 01:08:03 -04:00
Lirusaito
ca71bf00c2 Fix for Issue 694, use gSavedSettings instead of restricting globals.
Removes gAllowTapTapHoldRun and not much else we may want to remove a few more in the future, though.
2013-03-12 01:04:09 -04:00
Drake Arconis
98641d5d54 Fix small copy paste buggy 2013-03-12 00:59:24 -04:00
Drake Arconis
aac7fa84c2 Added per skin lsl highlighting and move function color to an actual color 2013-03-12 00:46:18 -04:00
Drake Arconis
e93bddcbed Update lsl keywords 2013-03-12 00:45:47 -04:00
Drake Arconis
d345630b2c Merge remote-tracking branch 'Aleric/master' into Cupcake 2013-03-11 19:55:38 -04:00
Drake Arconis
8c09a3c6af Rip out emerald boob physics 2013-03-11 19:21:45 -04:00
Drake Arconis
e6ee833d45 Add in droid sans license file 2013-03-11 03:44:32 -04:00
Aleric Inglewood
5a8308109b Lowered CurlTimeoutLowSpeedLimit from 56 kB/s to 7 kB/s.
This value really IS in bytes/s (not for the total), and apparently 56
kB/s is too optimistic. The value was used by LL for transfers that went
beyond the total download time (2 minutes?), adding enough seconds per
received bytes to the timeout to allow a download at 56 kB/s to finish.

Our meaning is different however: we time out immediately and whenever
the download drops below this speed.

Perhaps a better algorithm is where the speed demand is based on the
total size of the download, but I'm not sure we always know the size of
downloads at this point.
2013-03-10 17:45:39 +01:00
Aleric Inglewood
7dfef31469 Possible upload timeout improvement.
When uploading finishes, but is not detected, the timeout should be for
"reply delay", the time that the server takes before it replies, and not
CurlTimeoutLowSpeedTime. This patch adds code that takes this failure
into account (which happened only ONCE for me on Metropolis while flying
around and using trickle (not sure if that is relevant), so it's not
that likely to improvement anything in practise. Note that it is
detected by an assertion when it happens, so that we can safely assume
it normally never happened on SL).

* Generalized PUT / POST configuration by adding
  CurlEasyRequest::setPut, which now also supports keep-alive (which
  still isn't used).
* Upload content length is now stored in CurlEasyRequest::mContentLength
* CurlEasyRequest::has_stalled() now return false if it was possbile
  that the 'upload finished' detect failed AND calls upload_finished()
  itself in that case, so it is no longer 'const'.
* If low speed is detect exactly when the last bytes are being attempted
  to be sent (unlikely scenario), then the upload gets 4 more seconds
  after which is switches to CurlTimeoutReplyDelay.
* Added EDoesAuthentication and EAllowCompressedReply to replace
  booleans, for readability and type-safety, as did EKeepAlive. Note
  that this change inverts the meaning of the compression related parameter.
* Unrelated: removed an unnecessary #include "llurlrequest.h" from
  llxmlrpcresponder.h
2013-03-10 16:43:15 +01:00
Aleric Inglewood
96d302aa42 Be more verbose about internal (curl / timeout) errors.
Translates the CURLE_WRITE_ERROR into what it really means: that the low
speed check failed.
2013-03-09 05:26:52 +01:00
Lirusaito
78e1804381 Add Pathfinding UI from v3
Added libpathing to LLPHYSICSEXTENSIONS_INCLUDE_DIRS
llviewermenu updated a bit to be closer to v-d/rlva. Best viewed without space changes.
Updated llresmgr.cpp from v-d to "handle special case of input value being zero"
pipeline update: hideObject, restoreHiddenObject, hideDrawable, and unhideDrawable added.

Thanks to Henri Beauchamp for some UI code touchups, thanks to Zi Ree for Rebake notification.
Thanks to Mobius Ryba and Ansariel Hiller for the V1-style pathfinding icons.

Note: When opening from pie menu object selection is lost, unless the floater is already open..
This provides a more reliable reproduction of the bug we've been having with inspect.
2013-03-08 03:17:11 -05:00
Lirusaito
95bd81ee7e Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting 2013-03-08 02:57:48 -05:00
Lirusaito
06a73061ce More UI warnings fixup stuffs 2013-03-08 01:20:15 -05:00
Aleric Inglewood
933ca23348 Bug fix for ASSERT(previewp->mFormattedUpToDate || ret == SIZE_TOO_LARGE || ret == ENCODING_FAILED) 2013-03-08 03:37:00 +01:00
Lirusaito
bede980527 Fix Issue 689: ATTACH_NECK and ATTACH_AVATAR_CENTER are missing strings 2013-03-07 20:58:15 -05:00
Lirusaito
63dcd7ba32 Snapshot floater aesthetics
Restores the cancel button with new functionality! In Freeze mode, it will exit freeze! Otherwise it will just close the floater as it used to do.
Lines up everything nicely, and removes overly complex tool tips.
Does not change or remove any existing functionality.
2013-03-07 20:43:33 -05:00
Aleric Inglewood
e3f4022ffa Merge remote-tracking branch 'singu/master'
Conflicts:
	indra/newview/llvoavatar.cpp

Bug fix is no longer needed.
2013-03-07 16:53:15 +01:00
Drake Arconis
b4356107ed Updated droid sans to current version 2013-03-07 10:46:39 -05:00
Aleric Inglewood
f52e055414 Merge branch 'master' into curlthreading4 2013-03-07 13:49:42 +01:00