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
e1d243272f
V3 merge part 1 / 2.
2012-04-13 22:39:39 -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
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
8b8fe82c8e
Correct facepalm in llmessage port
2012-03-20 03:17:37 +01:00
Siana Gearz
2b833129c5
Merge branch 'master' of /cygdrive/c/git/SingularityViewer
2012-03-05 19:36:29 +01:00
Siana Gearz
5eb90ef9cd
Preference button to clear settings
2012-03-05 19:05:30 +01:00
Siana Gearz
b67fa864ff
First shot at fixing font fallback
2012-03-05 18:18:37 +01:00
Siana Gearz
a7d70878b7
Log threadcount together with memory
2012-02-29 16:03:11 +01:00
Shyotl
a6a69caa4f
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloateropenobject.cpp
indra/newview/llinventorybridge.cpp
indra/newview/llviewerinventory.cpp
2012-02-24 13:21:59 -06:00
Siana Gearz
10af9d64f2
One day this will be a memory stat
2012-02-24 03:26:06 +01:00
Siana Gearz
60ded2ad14
Initial invisiprim support in deferred
2012-02-17 05:52:41 +01:00
Shyotl
ae7b12f230
Interim commit before diving into reworking the inventory panel.
2012-02-16 19:25:59 -06:00
Siana Gearz
4cbf259ab3
Experimental tablet and pen support
2012-02-13 20:38:44 +01:00
Siana Gearz
d709200fc0
Those memory pools can't be of ANY use with our malloc
2012-02-11 17:01:52 +01:00
Siana Gearz
cd51a6f795
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-05 15:23:51 +01:00
Siana Gearz
3d40cd86ac
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-02-05 15:14:53 +01:00
Shyotl
b0ccec2b62
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
...
Conflicts:
indra/newview/llvoavatar.cpp
2012-02-01 03:10:46 -06:00
Siana Gearz
071745007a
Partial port of Phoenix Windlight parts
2012-02-01 06:36:10 +01:00
Lirusaito
3548521bef
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-31 03:55:57 -05:00
Shyotl
d15ed9ed34
I borked up the sUseStreamDraw logic earlier. When its a stream type, and sUseStreamDraw is false, don't use a vbo at all (I mistakenly had it use a dynamic vbo instead). Also, removed an unused (due to being renamed) setting from settings.xml
2012-01-31 02:54:42 -06:00
Lirusaito
655365247c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llpanelmaininventory.cpp
indra/newview/llpanelmaininventory.h
indra/newview/llvoavatar.cpp
2012-01-31 02:47:02 -05:00
Lirusaito
661f5ede04
Removed max node quick setting(set volatile in settings), put LOD(Obj. Detail) in its place.
2012-01-30 12:44:08 -05:00
Shyotl
9453c2c2e9
Memory tracking system updated.
2012-01-29 01:33:14 -06:00
Siana Gearz
a15e72dc03
Force translator off, remove its UI in chat, small adjustments
2012-01-28 21:52:26 +01:00
Siana Gearz
26858c026a
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-01-28 03:25:36 +01:00
Shyotl
fc65380f2a
Added auto avatar muting(appearance only) based on avatar complexity (disabled by default). Added several missing debug views.
2012-01-27 02:36:26 -06:00
Latif Khalifa
2e59ae1340
Implemented support for external script editor based on v3 code (part 2)
2012-01-27 05:25:18 +01:00
Shyotl
d7d65df9e0
HTTP inventory fetching enabled.
2012-01-21 02:37:22 -06:00
Shyotl
89e738003c
Default RednerDelayVBUpdate to false.
2012-01-03 20:28:15 -06:00
Siana Gearz
fd22d80dfd
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
indra/newview/llmanipscale.cpp
indra/newview/llmeshrepository.cpp
indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
Siana Gearz
697dd7e929
Preparing to add mesh upload.
2011-12-03 03:43:23 +01:00
Drake Arconis
6aa7f219cd
Merge remote-tracking branch 'upstream/master'
2011-11-08 05:22:47 -05:00
Siana Gearz
7fea7c589d
Make floating text draw distance tunable
2011-11-08 01:26:51 +01:00
Shyotl
6964cec6f1
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into future
2011-10-31 20:41:36 -05:00
Drake Arconis
a35ef93d19
Right Click Mouse Scroll Zoom and Xcode fix
2011-10-31 15:43:05 -04:00
Shyotl
0fde15246b
Moved some settings out of the main settings.xml and into settings_sh.xml where they belong.
2011-10-22 01:57:39 -05:00
Siana Gearz
df3d30acd9
Version 1.6.0.0
2011-10-17 03:56:47 +02:00
Shyotl
008bebd817
Merge with siana/future
2011-10-13 00:03:56 -05:00
Shyotl
59d50f3062
Meshy update. Mostly related to cost calculations... mostly.
2011-08-28 04:05:36 -05:00
Shyotl
c66065b688
CachedControl cleanup in random places. LL's ctor format is supported, so using such in LL code to ease diffs.
2011-08-28 01:04:30 -05:00
Shyotl
9d40820937
New object/avatar interp.
2011-08-19 01:36:01 -05:00
Shyotl
20ef149dcb
Added test setting 'ShyotlUseLegacyTextureBatching' to disable new texture indexing. The new indexing method requires heavy branching in shaders, which some hardware may not perfom well with.
2011-08-16 02:37:18 -05:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Shyotl
9aa26648c9
Added CurlUseMultipleThreads (requires restart to change)
2011-08-06 02:29:04 -05:00