Siana Gearz
cd2dc2f3ca
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/app_settings/settings.xml
indra/newview/llface.cpp
2012-07-03 07:49:22 +02:00
Shyotl
9ddbc132bf
View->Build menu selection now functions once more.
2012-07-02 15:38:38 -05:00
Shyotl
53a570b977
Push drawables into priority queue when their textures change number of components. (Quick and dirty fix for alpha faces not being placed into alpha pool until some other irrelivant rebuild state is set)
2012-07-02 00:50:55 -05:00
Shyotl
4ba1509371
Texcache tweakage.
2012-06-30 20:07:52 -05:00
Shyotl
399d93cc36
Compiler fixes and a crashfix.
2012-06-30 20:06:48 -05:00
Shyotl
67e1a3b004
Lindie viewer-dev catchup regarding rendering pipeline.
2012-06-30 20:05:31 -05:00
Shyotl
a8ebd6eebb
Fixed a nullptr that occasionally caused crashing on shutdown.
2012-06-19 14:31:03 -05:00
Shyotl
a3e6e96869
Emerald physics cleanup. Removed unused cruft. Disabling by default since it never worked (although it does now if set to enabled).
2012-06-18 14:50:39 -05:00
Shyotl
b5535c9cc4
Fixed a couple formatting errors in menu_inventory.xml
2012-06-16 01:45:13 -05:00
Shyotl
4c45e9a9d1
Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.
2012-06-15 09:51:11 -05:00
Shyotl
3796a216d2
Removed a few old settings from settings.xml. Added absent RenderAutoHideSurfaceAreaLimit setting.
2012-06-15 09:09:58 -05:00
Shyotl
21f7df0dcc
Stuck a space between realname and legacy name so long names now are more likely to split between lines more elegantly.
2012-06-12 02:14:19 -05:00
Shyotl
5b4700a8ee
Added RenderAutoHideSurfaceAreaLimit setting, and tweaked hud rendering(lighting issues)
2012-06-12 02:10:22 -05:00
Shyotl
0286c8bf55
Small GCC fix.
2012-06-11 07:18:05 -05:00
Shyotl
a399580c84
Stale/unloaded textures apparently sticking around. SH-3074 would probably explain better, but the issue is restricted as per usual.
2012-06-11 07:12:58 -05:00
Shyotl
349006637e
LL has played with texture discard priority/bias. Giving it a trial here.
2012-06-11 07:04:02 -05:00
Shyotl
945c663359
Updated LLInventoryModelBackgroundFetch and LLInventoryModel(code migration)
2012-06-11 06:57:54 -05:00
Shyotl
6b1f5c388f
Merged baking process with v3 head. Hopefully alleviates some baking oddities pertaining innitial login.
2012-06-11 06:54:59 -05:00
Shyotl
57641db71b
Added 'Move Forward' and 'Move Back' to multi-worn clothing context menus.
2012-06-11 06:43:05 -05:00
Shyotl
891d6d3448
Interim work on appearance editor.
2012-06-11 04:54:54 -05:00
Shyotl
5ce477c7cc
Removed redundant double-click-teleport logic.
2012-06-09 02:28:42 -05:00
Shyotl
1a217b23c6
SH-3065 Out-of-order operations on startup. http://hg.secondlife.com/viewer-beta/changeset/ecdfca07cbe3
2012-06-09 01:57:21 -05:00
Shyotl
bb8417d6be
Added some missing settings pertaining to marketplace features.
2012-06-09 01:50:50 -05:00
Shyotl
5228aa7029
Updated LLMeshRepoThread. Hopefully a little more reliable.
2012-06-09 01:48:01 -05:00
Lirusaito
ab5fd28cef
Added InventoryOutboxMax* keys from upstream to settings.xml
...
Prevents catastrophes, such as asserts and errors and crashes, explosions and godzilla?
Also fixed some spacing flaws (may aid in diffs from upstream in the future)
2012-06-03 14:05:29 -04:00
Shyotl
fb1594535e
Intermediate step in refactoring appearance panel
2012-06-02 17:32:19 -05:00
Lirusaito
73c05eff77
Cherry-pick of 24a7281bef42 from viewer-development, also added missing AttachmentDrop to notifications.xml
...
simon@Simon-PC.lindenlab.com: MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.
2012-06-02 05:13:50 -04:00
Lirusaito
9835d3b27e
Fix for invalid initialization error
2012-05-31 01:01:50 -04:00
Lirusaito
20f138b31f
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-30 21:16:27 -04:00
Shyotl
b15f2d1a56
Some elements were being incorrectly blocked by others in the customize floater.
2012-05-30 19:14:45 -05:00
Shyotl
f04aabde96
Updated client tagging system. Client tags only looked up in opensim, and most logic pulled out into its own singleton.
2012-05-30 19:14:11 -05:00
Lirusaito
c6120cd283
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-28 05:18:20 -04:00
Shyotl
51a4e4960f
V3 merge. Added LLMainLoopRepeater repeater. Disabled FBOs for baking. Fixed typo in strings.xml. Setting ThrottleBandwidthKBPS was used in a few places that MainloopTimeoutDefault should have been. Better outdated driver detection for ATI hardware.
2012-05-28 03:59:19 -05:00
Shyotl
271883e737
'Voice Preferences->Device Settings' crashfix. (NullPtr)
2012-05-23 18:23:27 -05:00
Lirusaito
58c58dc845
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-23 03:46:48 -04:00
Shyotl
61013dd2ab
Crashfix regarding LLViewerObject using released regions. V3 cherrypick.
2012-05-23 02:10:02 -05:00
Shyotl
a2649ceb5a
Stab at fixing deferred snapshots.
2012-05-22 23:37:50 -05:00
Shyotl
eb562c2470
Updated deferred rendering (STORM-1819 Ternary/Graded shadows)
2012-05-22 23:36:38 -05:00
Shyotl
ae0804beea
Trival V3 llmath merge.
2012-05-21 20:23:42 -05:00
Lirusaito
fa4ee55308
Nomade Zhao's 4 fixes for translation. Re: Issue 340
...
Conflicts:
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
2012-05-17 18:49:01 -04:00
Lirusaito
e729bd80ce
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-17 02:09:20 -04:00
Shyotl
9eda9ad462
GCC doing its thing (by being picky).
2012-05-17 00:47:00 -05:00
Shyotl
dbe50efc10
Added 'make outfit' back to appearance editor.
2012-05-16 23:25:01 -05:00
Shyotl
bf28ce4239
Few nullchecks, and fixed broken logic in LLPanelAvatar::canClose()
2012-05-16 12:06:05 -05:00
Drake Arconis
8192b547a8
Merge branch 'V2MultiWear' into v2mwArx
2012-05-15 10:37:55 -04:00
Drake Arconis
8dc0e16f0a
Modified wrapper script with new options for FMOD Ex
2012-05-15 10:37:33 -04:00
Drake Arconis
5a2d160ac4
Fixed FMOD Ex support under linux
2012-05-15 10:36:48 -04:00
Lirusaito
e20b383aa0
Small changes that seem to make clang happier.
2012-04-30 23:48:30 -04:00
Lirusaito
16c2235510
Fixed About Floater's background.
...
clear and transparent both refer to the same thing, code fix to reflect this.
2012-04-28 21:34:24 -04:00
Lirusaito
8e6063e7b9
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00