Commit Graph

4058 Commits

Author SHA1 Message Date
Lirusaito
5ac2a23b8d Update LSL information (Adds new AnimationOverride) 2013-04-16 20:16:44 -04:00
Lirusaito
8c49716eae Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.
2013-04-10 13:26:48 -04:00
Lirusaito
fd9f8fa71f Cleanup and Synchronization (pre-merge wrap-up commit) 2013-04-10 09:14:16 -04:00
Lirusaito
c2046025e3 Tiny fix to the Scripts sub-piemenu 2013-04-10 05:39:21 -04:00
Drake Arconis
eb25270df0 Only Aurora supports not having a last name. So lets just default it to Resident. 2013-04-09 10:51:11 -04:00
Drake Arconis
e9330f8a87 This should fix OSX blah blah 2013-04-09 08:12:13 -04:00
Lirusaito
b909a70413 [Frosting] Feature Request: Add Scripts sub-piemenu
Thanks in part to the FS team for already having something close, that made adding this all easier~
2013-04-09 00:31:00 -04:00
Lirusaito
f11f6618ab [Frosting:268] Sit via self pie menu 2013-04-09 00:25:42 -04:00
Latif Khalifa
fc4fcc9450 Merge remote-tracking branch 'shyotl/master' 2013-04-06 09:26:23 +02:00
Shyotl
b16bb264cc Added an experimental new alphamask detection method(set SHUseRMSEAutoMask to TRUE to use. Adjust SHAlphaMaskMaxRMSE to tweak cutoff). Fixed per-frame sky updates hammering analyzeAlpha. 2013-04-06 02:04:46 -05:00
Latif Khalifa
5ad2e32712 Merge remote-tracking branch 'lirusaito/master' 2013-04-05 23:11:30 +02:00
Nyx Linden
987ab9c07f SH-4059 FIX other's hover parameters affects your avatar's setting
Added an additional sanity check to make sure that other avatars don't
affect your wearables.
2013-04-05 23:10:17 +02:00
Nyx Linden
1a3e2ff18e SH-4050 FIX camera goes below ground when avatar offset set to 0
Added a constraint to ensure that the avatar's height (with offset)
does not go below 0.1 meters. Camera was getting confused since the avatar's
effective height was negative.

Note the avatar is mostly underground/contorted even at 0.1 meters, but
most users setting values this low will be making ultra-tinies and would
be hiding the avatar mesh. Camera stays above ground when height is at 0.1.

Conflicts:

	indra/llappearance/llavatarappearance.cpp
2013-04-05 23:10:16 +02:00
Nyx Linden
add9bb9945 SH-4044 FIX voice dot is offset vertically if using avatar height offset
Added the height offset in one too many places. fixing.
2013-04-05 23:10:16 +02:00
Lirusaito
da55a4a51c Fix Issue 726
Instead of focusing the chat bar when the chat history floater is visible, focus it onFocusReceived
This avoids the floater grabbing focus when returning from mouselook.
2013-04-04 18:31:35 -04:00
Lirusaito
fda82da3e9 Made mClickActionBuyEnabled and mClickActionPayEnabled CachedControl members, so they can be changed without a restart. 2013-04-03 08:23:23 -04:00
Lirusaito
0969f72bad Fix a bug in the pie menu, in v3 there is a separate pie menu for others' attachments, we don't have this yet. 2013-04-03 08:21:42 -04:00
Lirusaito
d064a54be3 [Frosting:288] Ability to left-click sit on one's own objects only.
Debug Settings DisableClickSitOtherOwner added.
Checkbox added to System Preferences for disabling click-to-sit on objects you don't own.

Also redid onCommitCheckBox a bit, best viewed without space changes.
There's more to this feature, but it doesn't work yet.
2013-04-02 18:54:16 -04:00
Latif Khalifa
82ecdd1079 Merge remote-tracking branch 'lirusaito/master' 2013-04-01 17:14:56 +02:00
Latif Khalifa
1fe3bf8357 Align whitespace with upstream in hope of avoiding future merge conflicts 2013-04-01 15:19:48 +02:00
Latif Khalifa
7e11ab9e95 Merge remote-tracking branch 'shyotl/master' 2013-04-01 14:44:07 +02:00
Latif Khalifa
7c7722a049 Merge remote-tracking branch 'aleric/master' 2013-04-01 14:43:59 +02:00
Lirusaito
d3dce27077 [Frosting:268] Quick fixes to LLViewerMenu
Fixes Stand Up slice not being hooked up in attachment menu
Translators, please update the pie menu accordingly. userdata="Translate,These"
Also fixes an instance where Continue Flying On Unsit would be ignored
2013-03-31 19:48:34 -04:00
Shyotl
e2255f419d Commented out a spammy llinfos message. 2013-03-30 01:26:30 -05:00
Shyotl
b07ab02f54 Added blendfunc checks when RenderDebugGL is TRUE. 2013-03-30 01:26:07 -05:00
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
Nyx Linden
2d6bc052ab SUN-57 SH-4039 FIX bake fail on non-ssb regions
We were getting the texture ID from the type,index couple, but were not
passing in index, which defaulted to 0. texture ID is available from the
texture object itself, so using that and removing the index parameter
to prevent future confusion.

Conflicts:

	indra/newview/llvoavatarself.cpp
2013-03-30 00:42:43 +01:00
Brad Payne (Vir Linden)
201647e1cf SH-4001 FIX - made local texture loading universal.
Conflicts:

	indra/newview/llvoavatarself.cpp
2013-03-30 00:37:21 +01:00
Latif Khalifa
20fe807271 First re-apply "SH-3941 SH-3954 FIX local appearance does not update properly" 2013-03-30 00:30:07 +01:00
Lirusaito
b3c78b0ca5 Fix ups for 6525ccc384
If log_path is empty, we shouldn't setChatLogsDir to it.
In fact, this may have been the cause of something Nomade Zhao brought up.

Also, InstantMessageLogPathAnyAccount was accidentally being set as a PerAccount
2013-03-29 15:53:30 -04:00
Lirusaito
401ea93b57 ToolPie Frosting
Easiest read with Copy/Move detection and no space changes
Adds debug settings: DragAndDropDistanceThreshold, EnableGrab, ClickToWalk, ClickActionBuyEnabled, ClickActionPayEnabled
ClickToWalk was redefaulted to false, though if you are curious enough to read this, you should give it a try, it takes some getting used to but it might be fun.
2013-03-29 03:56:26 -04:00
Lirusaito
126eeb9244 Inventory Updates and Clean Up
Better viewed without space changes
Adds translatable inventory strings
2013-03-29 03:25:03 -04:00
Lirusaito
e44ba343a6 Further LLViewerMenu updates 2013-03-29 03:01:18 -04:00
Lirusaito
dff59ab455 Fix Issue 719: Calling Cards can be opened more than just one at a time 2013-03-29 01:18:48 -04:00
Aleric Inglewood
c14601f7c2 Avoid assertion in ~AIStateMachine upon viewer exit.
Force the state to bs_killed before clearing the list of statemachines
in AIEngine::flush().
2013-03-28 03:01:27 +01:00
Aleric Inglewood
ac84e02018 Do not use a timer for HTTP get in LLTextureFetchWorker::doWork
All HTTP timing is done by AIHTTPTimeoutPolicy.

Inside LLTextureFetchWorker::doWork when mState == SEND_HTTP_REQ,
mCanUseHTTP is true, throttling is not in effect and mURL is not empty,
mLoaded is set to FALSE, mState is set to WAIT_HTTP_REQ and
LLHTTPClient::request is called that starts the download by curl.
A call back to LLTextureFetchWorker::callbackHttpGet is guaranteed,
which causes mLoaded to be set to TRUE (HTTPGetResponder::completedRaw
calls LLTextureFetchWorker::callbackHttpGet which sets mRequestedSize to -1
(if there was an error) and mLoaded to TRUE).

Being in state WAIT_HTTP_REQ, once mLoaded == TRUE (and mRequestedSize
is -1), the different timeout errors are handled.
2013-03-27 22:37:21 +01:00
Aleric Inglewood
bbf24b4994 Indentation fix. 2013-03-27 21:45:09 +01:00
Lirusaito
d7c4ce6b0a Spanish translation fixies 2013-03-27 14:50:04 -04:00
Lirusaito
cce43326c3 French translation touchup 2013-03-27 14:20:44 -04:00
Latif Khalifa
f63286b333 Merge remote-tracking branch 'shyotl/master' 2013-03-27 10:16:30 +01: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
Aleric Inglewood
41a0681768 Revert "Snapshot floater aesthetics"
This reverts commit 63dcd7ba32.

That commit is nonsense and only shows that Liru has no clue what he is
doing when it comes to the snapshot stuff :/.

And no, I wasn't even AWARE he made this commit, I was just happily
exploring and wanted to make a few snapshots when I suddenly noticed
that several things were BROKEN: the aspect that the fullscreen preview
was shown with was wrong, and when I wanted to limit the aspect of my
feed upload that wasn't possible anymore ?!?!??  WTF

Please don't screw up the hard work of others without at LEAST first
consulting them.
2013-03-27 02:22:48 +01:00
Aleric Inglewood
fa05647068 Compile fix 2013-03-27 00:56:28 +01: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
Lirusaito
b80a509ae2 Fix Issue 702: Copy Paste Parameters glitch
Also improves the related code.
It seems the main problem was calling updateVolume before setting sculpt params because this call relies on the isSculpted()
2013-03-26 18:16:50 -04: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