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

216 Commits

Author SHA1 Message Date
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
Shyotl
c4b77e247e LLInstanceTracker v3 merge 2011-11-23 23:40:31 -06:00
Siana Gearz
8421661a89 Version 1.6.0(3) 2011-11-08 01:27:12 +01:00
Shyotl
b64cb8d339 Lineending fixup 2011-10-31 20:44:43 -05:00
Siana Gearz
3e12fe15bc Version 1.6.0(2) 2011-10-20 18:44:21 +02:00
Siana Gearz
68e143de1b Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-10-19 18:11:58 +02:00
Siana Gearz
ef54491760 GCC 4.6.1 fix 2011-10-19 05:33:09 +02:00
Shyotl
82b0171a86 Workaround for mac startup hardlock. (STORM-1641) 2011-10-18 09:33:20 -05:00
Siana Gearz
142427b3e1 Version 1.6.0(1) 2011-10-18 04:17:31 +02: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
2b69eb9902 Misc little tidbits from V3. 2011-09-20 22:16:00 -05:00
Shyotl
587a687ac6 LLThread updated. 2011-09-20 22:10:12 -05:00
Shyotl
cce1395876 LLInstanceTracker and LLSingleton updated yet again. 2011-09-20 22:09:45 -05:00
Shyotl
244e30297f AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs. 2011-09-20 22:08:48 -05:00
Shyotl
d917bf6b06 LLAPRFile cleaned up 2011-09-20 21:39:27 -05:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing 
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
 2011-09-09 16:53:12 -05:00
Shyotl
5d21e676c6 Added new LSL constants (keywords). OBJECT_SCRIPT_TIME, PARCEL_DETAILS_ID, etc 2011-09-02 04:07:39 -05:00
Shyotl
2e8b363899 Plugin loading slightly tweaked on windows. Now warns in viewer thread on load failure. Also sets working directory if provided. 2011-08-27 01:58:53 -05:00
Shyotl
1f187b09ee LLCommon cleanup and updating to V2 (V3 now, I guess.) 2011-08-27 01:57:10 -05:00
Siana Gearz
e70bc6b800 Variable size region support, by RevolutionSmythe 2011-08-18 19:36:01 +02:00
Aleric Inglewood
dfa10281ea LLFrameTimer review and resulting changes. 
This makes the class API a bit more sane, although
only a bit, because I had to leave it working with
possibly new code merged in from LL: the API can't
really change. I also removed some unused code.

While reviewing how LLFrameTimer worked however,
I did find a few instances where things where broken:

* sFrameDeltaTime wasn't correctly updated (more
  than once per frame and therefore erratic). This
  only influenced scrolling speed, but still.
* While dragging an inventory item, the scroll
  arrows of a tab container didn't work
  (LLTabContainer::handleDragAndDrop).
* Map zoom interpolation was broken (it interpolated
  between A and B, but used the already updated
  interpolation for A the next frame...
  (added mCurZoomValInterpolationStart).
 2011-08-18 19:30:43 +02:00
Shyotl
d2ae02a855 Slight cleanup. Also, index arrays are always non-strided, so now using vectorization. 2011-08-18 00:33:59 -05:00
Shyotl
ecce8ad23a Instancetracker update. LLInstanceTrackerScopedGuard was deprecated, now removed. 2011-08-18 00:23:59 -05:00
Aleric Inglewood
3de99315e2 Some AIFrameTimer code cleanup and comment fixes. 2011-08-14 15:42:46 +02:00
Aleric Inglewood
5945793031 Implementation of AIFrameTimer. 2011-08-13 17:32:50 +02:00
Aleric Inglewood
449e7b2a84 Merge remote-tracking branch 'origin/master' 2011-08-13 17:32:27 +02:00
Siana Gearz
e6de1e0d5a Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future 2011-08-11 00:55:22 +02:00