Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,459 Commits 20 Branches 51 Tags
cd2dc2f3cac16902206ddecc53d4923fe3473e0f
Commit Graph

243 Commits

Author SHA1 Message Date
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
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Lirusaito
a82953d0d0 Few more GCC 4.7 fixes. 
include unistd when not on windows.
 2012-04-29 00:25:40 -04: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
83a3bbb48e Fixies from viewer-development 2012-03-06 09:01:01 +01:00
Siana Gearz
8b6f462d13 Wholesale update of llmessage to V3.2 
Note that this removes message logger for now.
 2012-03-06 07:31:15 +01:00
Siana Gearz
a7d70878b7 Log threadcount together with memory 2012-02-29 16:03:11 +01:00
Aleric Inglewood
0450358df3 Clean up after Linden Lab 2012-02-23 18:50:28 +01:00
Aleric Inglewood
b8744b9e6a LLViewerRegion WIP: Added all headers that are dragged in. 
Most in particular llevents.h, which comes along with
the demand that the old events in llevent.h are put
in a namespace LLOldEvents. Made all changes necessary
to compile the rest of the code again (without changing
the actual code: it's still using the old events).

This patch also removes LLStopWhenHandled and LLStandardSignal
from indra/llui/llnotifications.h because those are
moved to llevents.h. That seems to be the only change
to indra/llui/llnotifications.h that isn't floater related,
so I left the rest of that file alone.
 2012-02-18 02:22:49 +01:00
Aleric Inglewood
0a59b3bb54 Merge remote-tracking branch 'siana/master' 2012-02-10 02:14:44 +01:00
Aleric Inglewood
d4591828c8 Finished AIFrameTimer. 
Added documentation.
Added AIFrameTimer::isRunning.
Fixed a bug: mCallback was deleted before it was used.
 2012-02-10 01:37:43 +01:00
Siana Gearz
acf378e9f2 Auto-version system 2012-02-09 14:03:49 +01:00
Lirusaito
d85e1afd7e Spelling fix to documentation. 2012-02-05 18:18:22 -05: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
e9fa5e6f3d Fixed some static initialization brokenness with fasttimers. 2012-02-01 07:48:40 -06: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
Aleric Inglewood
b755bcd495 Merge remote-tracking branch 'origin/master' 2012-02-01 03:35: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
Shyotl
9453c2c2e9 Memory tracking system updated. 2012-01-29 01:33:14 -06:00
Shyotl
32c6365bf9 Octree tweakage. 2012-01-29 01:27:40 -06:00
Shyotl
6c921ba340 Routine V3 merge. 2012-01-29 01:25:39 -06:00
Shyotl
d9640ecc65 Little cleanup regarding crashlogger toggling. 2012-01-28 22:02:10 -06:00
Shyotl
c1b749e12c Added some missed fasttimers, removed some old ones. 2012-01-27 02:31:57 -06:00
Shyotl
f6fcf8ca38 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2012-01-26 00:14:38 -06:00
Shyotl
cef03d52cb Un-inline LLFastTimer::NamedTimer::getCountAverage and LLFastTimer::NamedTimer::getCallAverage so some experimenting can be done in llfasttimer_class.cpp without massive recompiles. 2012-01-25 20:14:38 -06:00
Shyotl
910cb29a7f Truncating fasttimer times to integers in the hovertext is not very useful.. 2012-01-25 20:11:07 -06:00
Siana Gearz
7d9299d870 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-01-25 22:18:21 +01:00
Siana Gearz
7fec659979 Update RLVa to 1.4.0-compatible 2012-01-25 21:11:33 +01:00
Siana Gearz
d385de9139 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llstartup.cpp
	indra/newview/llviewerregion.cpp
 2012-01-24 21:22:49 +01:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Aleric Inglewood
63117686b1 Typo fix in comment. 2012-01-22 03:12:24 +01:00
Aleric Inglewood
f6bd78083d More merge fixes 2012-01-22 02:49:06 +01:00
Aleric Inglewood
f176aeed8d More 64-bit related compile errors. 2012-01-22 02:48:28 +01:00
Aleric Inglewood
94d6ef126f Fix compiler error on 64-bit: error: cast from ‘char*’ to ‘U32 {aka unsigned int}’ loses precision 2012-01-22 01:56:35 +01:00
Aleric Inglewood
c4e55464c9 Resolved collisions of merge with siana/master 2012-01-22 01:32:52 +01:00
Siana Gearz
6a290864af Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-01-14 07:38:31 +01:00
Siana Gearz
20ab55752d Remove megaregion support 2012-01-14 06:46:16 +01:00
Shyotl
860bddb1f5 Added LLViewerInventoryType. Migrated some code to llinventoryfunctions.cpp. Pulled LLFolderViewEventListener out into itse own header. Misc tweaks to LLInventoryBridge and LLFolderBridge 2012-01-13 18:11:03 -06:00
Lirusaito
d6e9b50b99 Spelling fix 2012-01-09 16:14:33 -05:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights 
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
 2012-01-09 05:40:03 -05:00
Lirusaito
d505e515e4 Moved parentheses into liru_assert_strip for usability. 2012-01-08 21:03:13 -05:00
Lirusaito
9fd813267e Added three macros, two to help the final one which exists to show file and line on llassert messages; 
Changed the presentation of said messages to look nicer.
 2012-01-08 18:21:43 -05: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
Siana Gearz
66f4c170cb Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32 2011-12-01 16:51:43 +01:00