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
Shyotl
441b564afe
RLVa update.
2013-03-26 00:46:11 -05:00
Latif Khalifa
ea4f2ec7a7
Merge remote-tracking branch 'origin/sunshine2'
2013-03-24 14:23:18 +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
Lirusaito
212faab988
Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
2013-03-20 09:01:37 -04:00
Drake Arconis
5dd957f117
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into Cupcake
2013-03-20 08:31:21 -04:00
Lirusaito
c2b3322594
Pathfinding UI: Hide Capsule doesn't seem to work without havok
2013-03-20 08:30:36 -04: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
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
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
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
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
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
Lirusaito
db39bab95b
Fix a ton of run-time warnings about UI.
...
Cleans up some related code, probably looks nicer with space changes off.. though this is a pretty straightforward change.
Comments out code that still exists in xmls or might likely be added in future.
Each piece tested quite a bit.
2013-03-05 20:20:59 -05:00
Drake Arconis
565786ead1
Cleanup unused things
2013-03-05 13:35:58 -05:00
Drake Arconis
bc2d26464f
Remove dead code
2013-03-05 09:08:47 -05:00
Drake Arconis
e725a2915e
Fix typo in local asset browser
2013-03-04 21:59:04 -05:00
Lirusaito
79f6883bdf
[Issue 662] Translations retouch
...
Fixes overlaps and text running out of boundaries.
2013-03-03 14:48:03 -05:00
Lirusaito
9ffa700c97
xmllint fixups
2013-03-03 09:58:02 -05:00
Lirusaito
198ef8feb0
Fix French role_actions.xml parsing warning
2013-03-02 22:20:42 -05:00
Lirusaito
fcd343af69
Small touches
...
Missed a line during Issue 662
Correct order of contributors to be alphabetical
Present existing translations before others.
2013-03-02 19:25:47 -05:00
Lirusaito
11856180aa
[Issue 662] Translations from upstream to ease the resulting load on translators.
2013-03-02 14:32:26 -05:00
Lirusaito
4060db34fa
[Issue 662] The text replacing certain heading texts to be as wide as it needs to be
2013-03-01 19:53:29 -05:00
Lirusaito
bbe81a86f5
[Issue 662] Allow Version text on Region/Estate region tab to be as long as it needs to be
2013-03-01 15:36:24 -05:00
Lirusaito
1c0f222028
[Issue 662] Add Environment tab to Region/Estate Floater.
2013-03-01 15:23:44 -05:00
Lirusaito
c2c9d53000
[Issue 662] In preparation for Environment panel, sync panel_region_estate.xml
2013-02-28 23:38:49 -05:00
Lirusaito
8eff717612
[Issue 662] STORM-1265: Combine Terrain and Ground Textures tabs in Region/Estate floater
2013-02-28 23:37:23 -05:00
Lirusaito
c509378b24
[Issue 662] Make the Region/Estate's Covenant panel's text editor take up as much space as the LL Viewer's.
2013-02-28 19:44:29 -05:00
Lirusaito
df8595b72e
[Issue 662] Update llfloaterregioninfo.* in preparation for adding new functionality.
2013-02-28 15:04:05 -05:00
Lirusaito
620849607e
Fulfill feature request: Optionally, don't ShowDisplayNameChanges in notifications.
...
Show display name changes checkbox added to Adv. Chat->Chat/IM tab.
Better viewed without space changes.
2013-02-26 16:35:02 -05:00
Lirusaito
c3e63e7ab7
handleLocalChatBar visibility whenever ShowLocalChatFloaterBar changes value
2013-02-25 17:39:53 -05:00
Lirusaito
9d6d8da54d
Missed a spot in last commit.
2013-02-24 16:50:11 -05:00
Lirusaito
8e08e98c61
Only don't ShowLocalChatFloaterBar when Local Chat is torn-off. (Setting no longer requires relog)
2013-02-24 15:23:52 -05:00
Lirusaito
2ad9476961
Support SimulatorFeature MarketplaceURL for Marketplace Search tab on non-SL grids.
2013-02-24 10:54:46 -05:00
Lirusaito
c6aa1bb3ea
French network preferences update
2013-02-21 04:42:27 -05:00
Lirusaito
b9da20f0d6
Added new controls to Network Preferences
...
Adds Texture Bandwidth slider
Adds Use HTTP for Inventory and Textures checkboxes.
Also, swaps out the bandwidth slider for a new Z Offset slider on quick settings, as bandwidth sliders should be set and forget, there is no modern need for them to be changed so frequently.
[Note to translators: please examine the network preferences after this update, controls have been moved and may now overlap.]
2013-02-20 06:16:53 -05:00
Lirusaito
49eb78db27
Added the ever-requested marketplace tab to search floater (When on SL Grids, only)
2013-02-19 08:40:12 -05:00
Lirusaito
e01dd3292f
Add Script Info menu entry to the self pie menu...
...
From the comments in llfloaterscriptlimits.cpp, it seems like this was intended to be a feature.
2013-02-17 23:19:23 -05:00
Lirusaito
3c544bceb3
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon
2013-02-17 19:47:48 -05:00
Lirusaito
036328c3ac
Allow finding objects by typing on the script info scrolllists
...
Also tweaks columns widths and sort order to present information more effectively.
2013-02-17 19:41:59 -05:00
Siana Gearz
dbdd0ec4f1
Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer
2013-02-17 15:40:27 +01:00
Siana Gearz
0f54a2777e
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2013-02-17 15:36:59 +01:00
Siana Gearz
49c872c86d
Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer
2013-02-17 15:28:48 +01:00
