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

174 Commits

Author SHA1 Message Date
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
Shyotl
a237cb9cad llmemory.h cleanup. pulled llpointer, refcounter, smartpointer, singleton and safe handle out into their own headers. llmemory.h drags all those headers in for legacy support until everything else is cleaned up. getCurrentRSS() moved into LLMemory. getWorkingSetSize() added to LLMemory. 2011-07-29 20:40:08 -05:00
Siana Gearz
5314f76803 Version 1.5.10(1) 2011-07-26 04:16:47 +02:00
Siana Gearz
f30c284063 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
 2011-07-21 00:20:06 +02:00
Siana Gearz
2dd733cbaa Merge branch 'master' into future 2011-07-20 22:12:14 +02:00
Shyotl
ddb70568e1 And the new files required for it to actually work! Hurrr. 2011-07-20 06:25:22 -05:00
Shyotl
a994df7265 A majority of vectorization done. Note that it's INCOMPLETE. LLVolumeFace and LLVertexBuffer haven't been updated, so it's very dirty(and buggy) at those transitions. Compiles on windoze. 2011-07-20 06:07:13 -05:00
Shyotl
7e0ee6bb71 Shiny new name cache. 2011-07-15 00:21:38 -05:00
Shyotl
ce064f5af2 Some safe merging with v2. 2011-07-14 01:35:15 -05:00
Shyotl
459f00ccb8 LLVOCache class implemented. 2011-07-13 04:35:38 -05:00
Siana Gearz
2430c189fa Version 1.5.10(0) 2011-07-12 23:56:03 +02:00
Siana Gearz
73fd876423 OS X build fixes 2011-07-03 14:08:50 +02:00
Siana Gearz
fa790523d9 Version 1.5.9(2) 2011-06-29 22:34:57 +00:00
Siana Gearz
6348635d3f Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl) 2011-06-23 21:11:52 +02:00
Aleric Inglewood
b852a77a79 AIFilePicker related bug fixes. 
Bug fix in LLPreviewAnim::gotAssetForSave_continued: the if()
that tests if the result from the filepicker can be used was
accidently negated, mostly causing a crash when cancelling an
animation preview download (open animation, File -> Save Texture As..),
and canceling the save when a filename is picked.

The lifetime of AIFileUpload is actually till the very end
of the main(), causing it's member mPicker to be reused.
This leads to problems. When someone tries to open a file picker
for a file upload of the same time before the previous filepicker
called the callback function (ie, when two filepickers are
opened at the same time, or when the plugin crashes).
With this fix it is possible to open any number of file pickers.

Finally, for linux, LLFastTimers was using assembly with gives
rather random results on multicore machines. Since AIStateMachine
is using this for wait timing, it had a negative effect on
how well the file picker worked (the last message wasn't flushed
for several seconds).
 2011-06-21 02:49:34 +02:00
Siana Gearz
839418991e Version 1.5.9(1) 2011-06-19 00:41:56 +02:00
Shyotl
6b033b78f5 Added OS detection for Windows Server 2008, Windows Server 2012(beta), and Windows 8(beta). 2011-06-16 21:02:07 -05:00