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

190 Commits

Author SHA1 Message Date
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
Siana Gearz
e6de1e0d5a Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future 2011-08-11 00:55:22 +02:00
Aleric Inglewood
3d1863c1b5 Make sure we assign name before mStatus 2011-08-07 18:47:01 +02:00
Shyotl
f1759e0a96 Old-code related to sim-quota cleaned up. 2011-08-06 02:27:06 -05:00
Shyotl
f9bcbab5f3 Win compile fix. Including stdint.h explodes in vc2010, so #if'd it out for windows. 2011-08-05 21:39:43 -05:00
Shyotl
4dd888353d Merge branch 'future' of git://github.com/siana/SingularityViewer.git into V2Mesh 2011-08-05 20:12:59 -05:00
Shyotl
550fa0a160 Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh 
Conflicts:
	indra/newview/llspatialpartition.cpp
 2011-08-05 19:40:35 -05:00
Shyotl
b75a28ec15 Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a 2011-08-05 01:18:27 -05:00
Siana Gearz
87070be7e3 Merge branch 'master' of github-siana:siana/SingularityViewer into future 2011-08-03 01:01:00 +02:00
Siana Gearz
82fc160abe Look and criticize, Aleric 2011-08-02 02:16:31 +02:00
Siana Gearz
3b97a575d1 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-02 01:25:46 +02:00
Shyotl
f5915ab83c Some fixes and cleanup for strided vbos. Added LLStrider::assignArray to clean up some loops, as well as replace LLVector4a::memcpyNonAliased16. Works with both unstrided and strided vbo elements, and alignment padding (LLVec4->LLVec3,etc) 2011-08-01 18:19:08 -05:00
Siana Gearz
04b507d286 Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future 2011-08-02 01:14:28 +02:00
Siana Gearz
45c87257ed Debug build fixes, linux32 2011-08-02 01:13:53 +02:00
Aleric Inglewood
ef6737d0cd Shorten the time between freeing the lock and setting mStatus to STOPPED. 2011-08-02 00:05:14 +02:00
Aleric Inglewood
13be594651 Add proper locking around between threads shared variables and the calls to signal() and wait(). 2011-08-01 23:46:54 +02:00
Aleric Inglewood
313e008f61 Compile fixes to compile LL_DEBUG, and missing header (for linux?) 2011-08-01 23:33:56 +02:00
Siana Gearz
aa469d860f Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-01 19:56:33 +02:00
Shyotl
2aa4aa78e2 Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled. 2011-08-01 01:33:07 -05:00
Shyotl
4034c3464b Just making sure only one error thread is created. 2011-07-31 02:28:29 -05:00
Shyotl
62d0be964d Updated LLThread and LLMutex[Base] to prevent nested mutex locks in same thread from hardlocking. 2011-07-31 01:51:43 -05:00
Shyotl
b258b71e07 Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head. 2011-07-30 20:30:07 -05:00