Drake Arconis
1101b4075a
Merge remote-tracking branch 'siana/master' into AltCompilers
2012-07-10 14:16:24 -04:00
Drake Arconis
bcefad1a97
Massive windlight preset cleanup and updates
...
Cleaned up all duplicate windlight presets
Renamed windlight presets under correct current prefixes
Imported new presets from FS and Alchemy
2012-07-10 14:14:31 -04:00
Lirusaito
648766ad44
Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-10 03:40:09 -04:00
Lirusaito
176c91097a
Renamed DisableWindAudio to MuteWind and made it actually work
...
This will give Windows(only?) users experiencing the problem with wind sound corruption a way out.
2012-07-10 00:52:02 -04:00
Siana Gearz
c71c7ca7cc
Make defaults less rude to others
2012-07-10 05:50:47 +02:00
Siana Gearz
b19c284eb7
Make void water subdivision tunable
2012-07-10 05:34:50 +02:00
Lirusaito
fa9c48a376
Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear
...
Conflicts:
indra/cmake/00-Common.cmake
2012-07-09 18:45:00 -04:00
Drake Arconis
a67fe755cd
Fixed line endings
...
Fixed the line endings of the windlight files to unix
2012-07-09 12:32:34 -04:00
Lirusaito
8ec8acf610
Added Build preferences, like Emerald's. Exposed UI for giving an item with autoresponse
...
Pulled LLDropTarget into its own files and brought in the callback version so we can use either, whereever we need them, without rewriting them.
This makes code for drag and drop items into boxes easier.
--------Auto-Response--------
Added item box to Adv. Chat, finally you can send autoresponse with item!
Taught to LLViewerMessage to understand this.
------------Build------------
Added in comment labels for more sections of system preferences.
Everything new in the System->Build tab will reset on cancel, except the item, I see no reason to reset an item.
Added in BuildPrefs, and settings like them.
Taught LLToolPlacer how to give creations material type, and size, and ask importtracker to do the rest.
LLViewerObjectList now pings importtracker whenever it notices newly created objects that are ours entirely, so we can exact our will upon them.
Cleaned up most of importtracker code so we can use only the parts we need, and do it well.
Added ObjectPhysicsProperties to message.xml
2012-07-08 11:20:56 -04:00
Siana Gearz
045caad8f5
Revert "REVERT! Fix for media update commit."
...
This reverts commit 36a95ec36e .
2012-07-08 03:33:05 +02:00
Siana Gearz
a76a77a330
Merge branch 'V2MultiWear' into AltCompilers
2012-07-08 00:51:29 +02:00
Siana Gearz
36a95ec36e
REVERT! Fix for media update commit.
2012-07-08 00:31:18 +02:00
Lirusaito
58ff4a00f1
Some very good points Voodoo had, and some things I noticed and had to correct.
2012-07-06 12:14:55 -04:00
Drake Arconis
525e9d9a8e
Webkit plugin updates
...
Updated the webkit plugin with the latest features
Fixed SSL support in webkit
Other minor cleanup
2012-07-06 11:37:45 +00:00
Siana Gearz
30f49526db
Stray settings be gone
2012-07-04 10:44:37 +02:00
Lirusaito
4e2af85770
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
2012-07-03 01:57:55 -04:00
Siana Gearz
5a685febbf
Certificate update
2012-07-03 07:51:03 +02:00
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
Lirusaito
24db228406
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
indra/newview/llpaneleditwearable.h
2012-07-02 04:14:52 -04:00
Shyotl
67e1a3b004
Lindie viewer-dev catchup regarding rendering pipeline.
2012-06-30 20:05:31 -05:00
Lirusaito
5f98e24efe
Reduced AudioLevelWind default value in settings.
...
Wind shouldn't be so loud when standing still, what is LL thinking?
And Fixed spacing
2012-06-26 17:04:17 -04:00
Lirusaito
26810ff16a
Fixed up Keywords
...
Up to date definitions and reorganizations,
commented out constants that apparently don't exist.
Fixed Strings not highlighting by borrowing missing code from Phoenix.
Also, this fixes 1020 being treated as UnknownAltitude when not on SL grid
and cleans up the horrible tabbing/spacing mud in llfloateravatarlist.cpp
2012-06-24 01:52:56 -04:00
Lirusaito
56fb36bbfa
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-06-18 21:09:16 -04: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
Lirusaito
102565cd3e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/app_settings/settings.xml
2012-06-17 10:42:56 -04:00
Shyotl
3796a216d2
Removed a few old settings from settings.xml. Added absent RenderAutoHideSurfaceAreaLimit setting.
2012-06-15 09:09:58 -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
Lirusaito
0d87d3dc1c
Brought in EXT-1399 (relates to wind sounds)
...
Modified EXT-1399 to allow falling from the sky wind. When one drops from great heights, they hear the wind rush past their ears.
2012-06-09 10:49:48 -04:00
Shyotl
bb8417d6be
Added some missing settings pertaining to marketplace features.
2012-06-09 01:50:50 -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
Lirusaito
20f138b31f
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-30 21:16:27 -04: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
58c58dc845
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-23 03:46:48 -04:00
Shyotl
eb562c2470
Updated deferred rendering (STORM-1819 Ternary/Graded shadows)
2012-05-22 23:36:38 -05:00
Lirusaito
4799899317
Fritigern's script updates, brought in!
...
Also more stray spaces removed with care~
2012-04-26 22:09:58 -04:00
Lirusaito
3eccd251c0
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-22 21:36:59 -04:00
Shyotl
3cc37fb12b
LLAgentCamera update. Culled a bunch of dead code from llappviewer. Moved build-mode toggle off into lltoolmgr.
2012-04-22 19:42:37 -05:00
Lirusaito
d03b7d052d
Added EnableGestureSoundsSelf to allow playing the user's gesture sounds even while EnableGestureSounds is false.
2012-04-21 14:02:11 -04:00
Siana Gearz
3d40f96dfe
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-21 13:19:02 +02:00
Shyotl
275c85f482
Missed two shaders in earlier v3 merge.
2012-04-16 23:22:18 -05:00
Shyotl
e1d243272f
V3 merge part 1 / 2.
2012-04-13 22:39:39 -05:00
Siana Gearz
fd1896536e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-12 19:35:28 +02:00
Shyotl
b49ad1cd34
RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
2012-04-12 10:29:45 -05:00
Siana Gearz
01d6095242
Apparently overestimating j2c size is always a bad idea
2012-03-31 03:45:22 +02:00
Siana Gearz
f05edda4f4
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloatermessagelog.cpp
indra/newview/llstartup.cpp
indra/newview/llviewermenu.cpp
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/menu_inventory.xml
2012-03-28 22:27:45 +02:00
Siana Gearz
be9f3178c0
Fixies, missed files
2012-03-28 01:45:10 +02:00
Siana Gearz
3acf6dc001
Another stab at making textures work as they should
2012-03-27 16:23:55 +02:00
Siana Gearz
fee59e83b8
Fix size estimation
2012-03-26 19:53:04 +02:00
Siana Gearz
70438fa06f
Catching up with Lindies part 3
2012-03-26 15:01:53 +02:00
Siana Gearz
3f0f955a76
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00