Commit Graph

4014 Commits

Author SHA1 Message Date
Shyotl
03272c8875 Clamp LLMeshSkinInfo::mJointNames to a max of 64 entries. Also checking size in lldrawpoolavatar(Redundant checks added to just match similar logic LLRiggedVolume::update more closely.) 2013-03-30 01:01:53 -05:00
Shyotl
1965224912 Stabbed some blendfunc state issues. This fixes some ui flicker which popped up recently (perhaps after merging, or I just never noticed it before then) 2013-03-30 00:57:49 -05:00
Shyotl
92cc65bf5e Decoupled rlva/setting based z-offset from param based z-offset. This reverts questionable changes introduced in the recent rlva merge. 2013-03-27 01:36:23 -05:00
Shyotl
60f1bada3d Undo a bit of regression in llphysicsmotion 2013-03-26 23:10:26 -05:00
Latif Khalifa
303840f729 Merge remote-tracking branch 'shyotl/sunshine'
Conflicts:
	indra/llappearance/llavatarappearance.cpp
	indra/newview/character/avatar_lad.xml
	indra/newview/llagent.cpp
2013-03-26 23:54:36 +01:00
Aleric Inglewood
779f697ffb Fix yield_ms().
This fixes
https://code.google.com/p/singularity-viewer/issues/detail?id=714

The problem was a typo in AIStateMachine::sleep, >= should have been <=
which caused a state machine that uses yield_ms() to never run anymore
when next run it already should have run again. AIFilePicker is the only
state machine that currently uses yield_ms and I hadn't spotted this
because I don't have plugin messages on by default which made my viewer
just that much faster that it the yield never expired the first run
already (causing it to expire immediately).

The rest of the changes in this commit are just minor improvements /
conformation to the EXAMPLE_CODE in aistatemachine.cpp.
2013-03-26 23:30:04 +01:00
Aleric Inglewood
524fdf033d Merge remote-tracking branch 'singu/master' 2013-03-26 21:10:00 +01:00
Shyotl
441b564afe RLVa update. 2013-03-26 00:46:11 -05:00
Shyotl
1705167998 Fixed non-debug compile. 2013-03-24 23:20:40 -05: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
cfa3766bc7 Quick fix for the Mac build.
TODO: Make this version dependant so it works with newer Xcode too
2013-03-24 17:11:03 +01:00
Latif Khalifa
ea4f2ec7a7 Merge remote-tracking branch 'origin/sunshine2' 2013-03-24 14:23:18 +01:00
Latif Khalifa
97c340be54 Merge remote-tracking branch 'lightdrake/CupCake' 2013-03-24 14:22:44 +01:00
Latif Khalifa
afc137bb3f Merge remote-tracking branch 'aleric/master' 2013-03-24 14:22:28 +01:00
Latif Khalifa
db497ccf57 Merge remote-tracking branch 'lirusato/Frosting' 2013-03-24 14:22:02 +01:00
Aleric Inglewood
2916d9353e Comment fix. 2013-03-23 22:22:38 +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
Drake Arconis
43ed77f4d5 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake 2013-03-23 11:05:20 -04: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
Drake Arconis
91b3cdde39 Unbreak non-debian derived and standalone linux 2013-03-21 16:55:25 -04:00
Aleric Inglewood
712c46a74e Add comment with regard to LLSD in the body of pages with an HTTP error code. 2013-03-21 20:56:21 +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
4be1d057bc Fix windows compile warnings. 2013-03-19 23:59:15 +01: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
9ff1c8b879 SH-3798 FIX avatar skins look dull
Wearable parsing error caused last texture in some assets to fail to parse.
Parser now does not throw an error if the wearable does not end in a newline
2013-03-19 02:09:23 +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
Shyotl
13d55cbeba Changed several setting lookups to cachedcontrols in LLAgentCamera 2013-03-14 14:38:23 -05:00
Shyotl
1dbaa19e99 Reworked control variable lookup profiling. Should practically be free, and is now enabled for relwithdebinfo. Use dumpcalls for output. 2013-03-14 14:37:20 -05: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
Drake Arconis
ce7966b750 Merge remote-tracking branch 'Lirusaito/Frosting' into Cupcake 2013-03-12 01:36:59 -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