Commit Graph

2140 Commits

Author SHA1 Message Date
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
Siana Gearz
b03b4db7c7 Buddy search adjustment 2012-02-05 15:13:52 +01:00
Siana Gearz
859e2701f2 Restore LightShare compatibility 2012-02-05 13:52:50 +01:00
Shyotl
2617df44db VC doesn't seem to like ctor being used to assign a reference pointer. 2012-02-05 05:58:36 -06:00
Shyotl
01a8e11ef3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
Conflicts:
	indra/llcommon/llfasttimer_class.cpp
	indra/llcommon/llfasttimer_class.h
2012-02-05 05:57:44 -06:00
Aleric Inglewood
5a455eac91 Fixed LLFastTimers et al.
No longer crash when std::vector moves in memory when it grows.
Fixed display of timer values (in ms).
2012-02-05 05:35:01 +01:00
Shyotl
e18e051bfc sDelayedVBOEnable is still required to prevent framerates from getting clobbered on gl context change. 2012-02-03 14:25:51 -06:00
Shyotl
bf44d3f98e Prevent using multisample FBOs if FBOs are not enabled, or multisample FBOs are unsupported 2012-02-03 14:12:36 -06:00
Shyotl
b6fa215c4e Don't render particles on visually muted avatars. 2012-02-03 14:11:29 -06:00
Shyotl
726dc02aaa Was looking up ascent colors in incorrect control group. 2012-02-03 14:11:10 -06:00
Shyotl
9ee0c5acf3 Having BackgroundYieldTime set to a large enough value would cause a stall if client isn't in focus during login. 2012-02-02 23:44:35 -06:00
Shyotl
5e0140ba81 Fixed a minor syntax error in menu_inventory.xml. 2012-02-02 23:43:04 -06:00
Shyotl
a690c970e6 RenderAutoMuteByteLimit and RenderAutoMuteSurfaceArea: Only 'grey' out visually blocked avatars on impostor pass. 2012-02-02 18:14:52 -06:00
Shyotl
db28c382e0 Apparently LLMeshRepoThread::lodReceived leaked and LL decided to fix it. 2012-02-02 18:07:29 -06:00
Shyotl
1747d529d8 Stall object updates (including flexi) while tiling. Also fix matrix stack breakage 2012-02-02 18:05:07 -06:00
Lirusaito
27763d8390 Small fix for skins' Additional Info box.
Accidentally made it editable while culling; No longer.
2012-02-02 17:42:19 -05:00
Lirusaito
ef79781c9a Disabled editing the avatar key in profiles.
Should have already been disabled, the copy button only copies the original key either way and the key is unchanging.
2012-02-02 17:00:39 -05:00
Siana Gearz
7b6ff27c4b Awesomize buddy search 2012-02-02 12:18:35 +01:00
Siana Gearz
2526d04397 Cosmetic fix llRegionSayTo 2012-02-02 11:31:46 +01:00
Siana Gearz
4ffa06ae07 More reliable preview perm checks 2012-02-02 09:52:34 +01:00
Lirusaito
03c0509a6c Tiny change to allow /ME to work in instant messages.
Sometimes people want to type in all caps, sometimes caps lock goes on by accident, either way, in instant messages, it won't affect /ME anymore.
TODO: /ME for local chat.
2012-02-02 03:49:48 -05:00
Siana Gearz
f68211d83e Awesomely fixed OpenAL for Linux 2012-02-02 09:06:12 +01:00
Siana Gearz
7694f915f5 Fix cache thinking once full, always full. 2012-02-02 08:43:01 +01:00
Lirusaito
0340778775 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/llvoavatar.cpp
2012-02-01 11:24:45 -05:00
Lirusaito
6fecfad2a2 Removed value panels from volume. 2012-02-01 11:10:23 -05:00
Shyotl
e9fa5e6f3d Fixed some static initialization brokenness with fasttimers. 2012-02-01 07:48:40 -06:00
Siana Gearz
b5ec7fe015 Actually enable Region WindLight 2012-02-01 12:20:54 +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
55cce46454 Restoring preset loading 2012-02-01 09:59:31 +01:00
Siana Gearz
071745007a Partial port of Phoenix Windlight parts 2012-02-01 06:36:10 +01:00
Aleric Inglewood
b755bcd495 Merge remote-tracking branch 'origin/master' 2012-02-01 03:35:10 +01:00
Aleric Inglewood
315552d1e0 Allow main window to be unfocused during startup in debug mode. 2012-02-01 03:34:19 +01:00
Aleric Inglewood
e7b2972fc8 LLVFile::readFile must return LLPrivateMemoryPool allocated data. 2012-02-01 03:33:39 +01:00
Aleric Inglewood
e1675f6bd1 Remove erroneous comment. 2012-02-01 03:32:10 +01:00
Aleric Inglewood
2044b88015 Don't use NamedTimerFactory while it's being initialized. 2012-02-01 03:31:19 +01:00
Aleric Inglewood
77a21f95e5 Singleton<> improvements.
Allow Singleton<>::instance to be inlined
and add a new warning for accesses to the
singleton while its being initialized.
2012-02-01 03:27:04 +01:00
Aleric Inglewood
a4e05eea9d Delete singleton instance last, which seems slightly more robust. 2012-02-01 03:23:55 +01:00
Lirusaito
373cb7fb39 Added floater shortcut to toolbar. 2012-01-31 12:54:04 -05:00
Lirusaito
2e240e70d6 Added in snapshot keyboard shortcut to tooltip. 2012-01-31 08:03:16 -05:00
Lirusaito
bdcb5dc877 Culled what wasn't needed, added in keyboard shortcut helpers in tooltips
Things still probably can be culled to shorten this file, but what definitely wasn't needed is removed.
People who want to learn keyboard shortcuts now need only hover their mouse over the buttons on the toolbar.
2012-01-31 07:29:39 -05:00
Lirusaito
e7a59c1031 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-31 03:59:25 -05:00
Shyotl
8ae25e4812 GCC compile fix. 2012-01-31 02:57:32 -06: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
Shyotl
eaecc9a4d0 RenderVBOEnable was completely broken by ll, so I fixed it. 2012-01-30 19:50:41 -06:00
Lirusaito
dfe33963bb More precise volume controls. 2012-01-30 13:38:39 -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
Lirusaito
5858f2822c Further Culling and proper constraints of VolumeLOD for protection. 2012-01-30 12:27:55 -05:00