Commit Graph

244 Commits

Author SHA1 Message Date
Lirusaito
bca8f830f2 Group Feature Request: Optionally display indicator over typing avatar's heads.
Adds Debug Setting UseTypingBubbles
Adds "Use overhead typing indicator bubbles" to Adv. Chat-> Chat/IM
Thanks to Firestorm for this simple addition
2013-04-24 14:15:00 -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
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
Latif Khalifa
7e11ab9e95 Merge remote-tracking branch 'shyotl/master' 2013-04-01 14:44:07 +02:00
Shyotl
e2255f419d Commented out a spammy llinfos message. 2013-03-30 01:26:30 -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
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
Shyotl
60f1bada3d Undo a bit of regression in llphysicsmotion 2013-03-26 23:10:26 -05:00
Lirusaito
7aa0b439a8 Updates and clean up and frosting, oh my~
Removes old code for permitting emerald attachment points
Removes other old dead code...
Updates RLVa a bit.
Adds more translation flexibility via strings.xml
2013-03-24 12:29:58 -04:00
Latif Khalifa
ea4f2ec7a7 Merge remote-tracking branch 'origin/sunshine2' 2013-03-24 14:23:18 +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
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
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
Drake Arconis
8c09a3c6af Rip out emerald boob physics 2013-03-11 19:21:45 -04:00
Drake Arconis
3fac86158c General cleanup of unused variable warnings 2013-03-04 16:04:05 -05:00
Drake Arconis
b800320a49 Remove LLMemType and related files 2013-03-04 12:02:01 -05:00
Shyotl
e187e642c0 Restored some RLVa shownames logic that was clobbered a while ago. 2013-02-25 13:00:07 -06:00
Shyotl
34cf0329ab Crahfix for avatars, as destruction can be delayed via llpointer refs, meaning the region the av was in could be long gone before the avs destructor is actually called. Calling logPendingPhases in a more reasonable place (markDead). 2013-02-25 12:55:50 -06:00
Shyotl
94a0040ddb Sunshine catchup. 2013-02-25 12:53:18 -06:00
Shyotl
76f3dc9e19 Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback. 2013-02-19 01:50:46 -06:00
Shyotl
4cc35d6c66 Fixed up some silly issues with the client tag system. 2013-02-17 02:54:30 -06:00
Latif Khalifa
18816ae146 Merge remote-tracking branch 'shyotl/sunshine' 2013-01-21 11:25:10 +01:00
Shyotl
e622e03d2a Bulk of server-baking impelmentation and a bit of cleanup. 2013-01-13 02:37:12 -06:00
Siana Gearz
896036b3c2 Removing ReSit, because it's not so very nice 2013-01-12 00:50:24 +01:00
Shyotl
7ca974f731 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into sunshine 2013-01-08 17:06:08 -06:00
Shyotl
54771409d6 Merge branch 'master' into sunshine
Conflicts:
	indra/llimage/llimage.cpp
	indra/llui/llui.cpp
	indra/newview/llvoavatar.cpp
2013-01-08 17:05:29 -06:00
Shyotl
776a977824 Completed code migration to LLAvatarAppearance 2013-01-05 17:12:02 -06:00
Shyotl
5cf091b8b2 Completed code migration from LLViewerWearable to LLWearable. 2013-01-05 00:33:55 -06:00
Shyotl
9596514c79 Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata 2013-01-04 20:50:35 -06:00
Aleric Inglewood
2fbd53807c Do not use LLCachedControl as global variables. 2013-01-03 23:25:18 +01:00
Siana Gearz
1872337f5f Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-01-03 02:17:20 +01:00
Siana Gearz
8b2dcb6cb0 We're supposed to use HTTP bake fetch now 2013-01-03 00:10:56 +01:00
Aleric Inglewood
b0fe12f597 Snapshot Freeze Time: add Langolier tag for new (invisible) avatars.
If an avatar TP's in while you are in Freeze Time mode, they now have a
visible tag with the tag 'Langolier' in it. After exiting Freeze Time
mode they become visible. Before they would stay invisible.
2013-01-03 00:02:28 +01:00
Aleric Inglewood
e666c60e7d Merge remote-tracking branch 'singu/master' 2012-12-29 17:05:15 +01:00
Lirusaito
cf5838505f In-world feature request: Announce in chat when someone has taken a snapshot.
AnnounceSnapshots debug setting.
"Announce when someone takes a snapshot" added to Vanity Main Preferences.
took_a_snapshot translatable string added to strings.xml

Also in this commit:
Turned PlayTypingSound check into LLCachedControl.
In preparation for the crippling of all old viewers, the Vanity Main tab shall henceforth only be called Main, not Main  (General)
This change has been made in the code comments and the UI itself.
2012-12-29 07:58:06 -05:00
Shyotl
dd15b9234f Migrated LLTexLayerParams. Renamed LLTexLayerSet(Buffer) to LLViewerTexLayerSet(Buffer), and provided simple bases in llappearance/lltexlayer.h to mimic new usage. Reworked various bits to work with these changes, and performed some basic cleanup of LLVOAvatar(Self) 2012-12-24 17:20:46 -06:00
Shyotl
d03d145be4 Pulled LLAvatarJointMesh out of LLViewerJointMesh. 2012-12-23 18:33:35 -06:00
Inusaito Sayori
8e3da75c3c Missed a spot for 487. 2012-12-23 15:10:53 -05:00
Shyotl
1083d7e0ef Added LLGLTexture. Virtually completely virtual for now. Also added LLTextureManagerBridge, although not yet utilized. 2012-12-22 23:58:42 -06:00
Shyotl
389c35e08e Pulled LLAvatarJoint out of LLViewerJoint 2012-12-22 16:30:38 -06:00
Shyotl
f9d205b869 Intermediary commit. Exploit virtuals to 'emulate' real llavatarappearance.h. 2012-12-20 02:53:45 -06:00
Shyotl
e08afcb963 Created llappearance project. Migrated llvoavatardefines and llwearabletype. 2012-12-20 00:00:17 -06:00
Aleric Inglewood
a9963bcdb3 In FreezeTime mode, keep avatars that TP away.
If an avatar TP's away (or quits), he will not
disappear anymore from a frozen scene. Unfreezing
makes him disappear of course (and clean up).

Known bug: if during Freeze Time mode someone
TPs away and then back, then he becomes a cloud
after Freeze Time is ended, which can only be
reset by another teleport (or relog) from either
the cloud or the one seeing him as cloud.
I decided not to fix this, cause there are things
with a higher priority and this - if it happens
at all - is rare and easy to recognize and work
around.
2012-12-16 00:13:06 +01:00
Aleric Inglewood
e0c0da7dff In Freeze Time re-show fullscreen preview when clicking thumbnail. 2012-12-15 02:20:53 +01:00
Aleric Inglewood
cfa8df0575 Merge branch 'master' into llwebprofile 2012-12-14 20:43:17 +01:00
Aleric Inglewood
15b6593143 Large snapshot update (part 2) 2012-12-14 02:31:08 +01:00
Lirusaito
c24950b261 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
Conflicts:
	indra/newview/llfloateravatarpicker.cpp - Includes to v-d style, since plain alphabetical just won't cut it. Shyotl's changes for name system, here.
	indra/newview/llpanelgroupinvite.cpp - Shyotl's changes for name system, here.

Also corrected new README to have less typos and be slightly more accurate.
2012-12-10 11:24:25 -05:00
Lirusaito
b9cfd2fae5 Replace the tricky copy-paste-everywhere Display Name system code with a unified function
Only does that, dun believe me? Take a look, oh... it also corrects improper interpretations of the PhoenixNameSystem value: 1 is both, 2 is displays, 0 and anything else is Legacy.
Also replaces a bit of the display name support code with new system... by definition this shouldn't change the log file, only the title of the session..
because of my bad connection during week days, I can not confirm this working 100%,
but if it does end up changing the logs under certain unseen conditions, replace the new name check with gCacheName->getFullName(id, name) but this reallllly shouldn't happen!
2012-12-04 00:36:12 -05:00