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

242 Commits

Author SHA1 Message Date
Aleric Inglewood
7f78870295 Merge remote-tracking branch 'siana/master' into curlthreading2 
Conflicts:
	indra/llcommon/llstring.cpp
	indra/llmessage/llcurl.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/viewer_manifest.py
	install.xml

Resolved:
	indra/llcommon/llstring.cpp :
		two different ways to work around compile error.
	indra/llmessage/llcurl.cpp :
		this file is no longer used.. I deleted huge
		parts to mark that I implemented that. Siana
		apparently made a few changes in those parts.
	indra/newview/llviewertexturelist.cpp :
		manually copied patch. Mine also removed trailing
		spaces, keeping that.
	indra/newview/viewer_manifest.py:
		Collision with changes from Liru, which have been
		ignored (kept siana/master).
	install.xml:
		Collision with an earlier screw up. I kept the
		fix from siana/master.
 2012-07-18 02:08:31 +02:00
Lirusaito
648766ad44 Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-10 03:40:09 -04:00
Lirusaito
176c91097a Renamed DisableWindAudio to MuteWind and made it actually work 
This will give Windows(only?) users experiencing the problem with wind sound corruption a way out.
 2012-07-10 00:52:02 -04:00
Siana Gearz
c71c7ca7cc Make defaults less rude to others 2012-07-10 05:50:47 +02:00
Siana Gearz
b19c284eb7 Make void water subdivision tunable 2012-07-10 05:34:50 +02:00
Siana Gearz
045caad8f5 Revert "REVERT! Fix for media update commit." 
This reverts commit 36a95ec36e.
 2012-07-08 03:33:05 +02:00
Siana Gearz
36a95ec36e REVERT! Fix for media update commit. 2012-07-08 00:31:18 +02:00
Drake Arconis
525e9d9a8e Webkit plugin updates 
Updated the webkit plugin with the latest features
Fixed SSL support in webkit
Other minor cleanup
 2012-07-06 11:37:45 +00:00
Siana Gearz
30f49526db Stray settings be gone 2012-07-04 10:44:37 +02:00
Aleric Inglewood
69ca6cd5b2 WIP: Make curl thread code robust and flexible. 
Conflicts:

	indra/llmessage/llcurl.cpp
	indra/llmessage/llcurl.h
	indra/newview/app_settings/settings.xml
	indra/newview/llappviewer.cpp
	indra/newview/llmeshrepository.cpp

Resolved:

	indra/llmessage/llcurl.cpp:

	  Basically removed (not used anyway)

	indra/llmessage/llcurl.h:

	  Basically removed (just includes aiculr.h now)

	indra/newview/app_settings/settings.xml:

	  CurlUseMultipleThreads was remvoved.
	  CurlMaximumNumberOfHandles and CurlRequestTimeOut
	  are still in there, but unused at the moment.

	indra/newview/llappviewer.cpp:

	  CurlMaximumNumberOfHandles and CurlRequestTimeOut
	  are unused at the moment.

	indra/newview/llmeshrepository.cpp:

	  Lock mSignal always (is unlocked inside wait()).
	  Use mSignal lock to see if we are waiting; remove mWaiting.
	  Return false from the MeshFetch functions iff we have to retry
	  a HTTP fetch. Catch the error exception thrown by getByteRange
	  instead of using it's return value (always returns true
	  anyway).
 2012-06-28 01:30:46 +02:00
Lirusaito
5f98e24efe Reduced AudioLevelWind default value in settings. 
Wind shouldn't be so loud when standing still, what is LL thinking?
And Fixed spacing
 2012-06-26 17:04:17 -04:00
Lirusaito
56fb36bbfa Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-06-18 21:09:16 -04:00
Shyotl
a3e6e96869 Emerald physics cleanup. Removed unused cruft. Disabling by default since it never worked (although it does now if set to enabled). 2012-06-18 14:50:39 -05:00
Lirusaito
102565cd3e Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/newview/app_settings/settings.xml
 2012-06-17 10:42:56 -04:00
Shyotl
3796a216d2 Removed a few old settings from settings.xml. Added absent RenderAutoHideSurfaceAreaLimit setting. 2012-06-15 09:09:58 -05:00
Shyotl
6b1f5c388f Merged baking process with v3 head. Hopefully alleviates some baking oddities pertaining innitial login. 2012-06-11 06:54:59 -05:00
Lirusaito
0d87d3dc1c Brought in EXT-1399 (relates to wind sounds) 
Modified EXT-1399 to allow falling from the sky wind. When one drops from great heights, they hear the wind rush past their ears.
 2012-06-09 10:49:48 -04:00
Shyotl
bb8417d6be Added some missing settings pertaining to marketplace features. 2012-06-09 01:50:50 -05:00
Lirusaito
ab5fd28cef Added InventoryOutboxMax* keys from upstream to settings.xml 
Prevents catastrophes, such as asserts and errors and crashes, explosions and godzilla?
Also fixed some spacing flaws (may aid in diffs from upstream in the future)
 2012-06-03 14:05:29 -04:00
Lirusaito
58c58dc845 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-23 03:46:48 -04:00
Shyotl
eb562c2470 Updated deferred rendering (STORM-1819 Ternary/Graded shadows) 2012-05-22 23:36:38 -05:00
Lirusaito
3eccd251c0 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-22 21:36:59 -04:00
Shyotl
3cc37fb12b LLAgentCamera update. Culled a bunch of dead code from llappviewer. Moved build-mode toggle off into lltoolmgr. 2012-04-22 19:42:37 -05:00
Lirusaito
d03b7d052d Added EnableGestureSoundsSelf to allow playing the user's gesture sounds even while EnableGestureSounds is false. 2012-04-21 14:02:11 -04:00
Siana Gearz
3d40f96dfe Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-21 13:19:02 +02:00
Shyotl
e1d243272f V3 merge part 1 / 2. 2012-04-13 22:39:39 -05:00
Siana Gearz
01d6095242 Apparently overestimating j2c size is always a bad idea 2012-03-31 03:45:22 +02:00
Siana Gearz
f05edda4f4 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
 2012-03-28 22:27:45 +02:00
Siana Gearz
3acf6dc001 Another stab at making textures work as they should 2012-03-27 16:23:55 +02:00
Siana Gearz
fee59e83b8 Fix size estimation 2012-03-26 19:53:04 +02:00
Siana Gearz
70438fa06f Catching up with Lindies part 3 2012-03-26 15:01:53 +02:00
Siana Gearz
8b8fe82c8e Correct facepalm in llmessage port 2012-03-20 03:17:37 +01:00
Siana Gearz
2b833129c5 Merge branch 'master' of /cygdrive/c/git/SingularityViewer 2012-03-05 19:36:29 +01:00
Siana Gearz
5eb90ef9cd Preference button to clear settings 2012-03-05 19:05:30 +01:00
Siana Gearz
b67fa864ff First shot at fixing font fallback 2012-03-05 18:18:37 +01:00
Siana Gearz
a7d70878b7 Log threadcount together with memory 2012-02-29 16:03:11 +01:00
Shyotl
a6a69caa4f Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
 2012-02-24 13:21:59 -06:00
Siana Gearz
10af9d64f2 One day this will be a memory stat 2012-02-24 03:26:06 +01:00
Siana Gearz
60ded2ad14 Initial invisiprim support in deferred 2012-02-17 05:52:41 +01:00
Shyotl
ae7b12f230 Interim commit before diving into reworking the inventory panel. 2012-02-16 19:25:59 -06:00
Siana Gearz
4cbf259ab3 Experimental tablet and pen support 2012-02-13 20:38:44 +01:00
Siana Gearz
d709200fc0 Those memory pools can't be of ANY use with our malloc 2012-02-11 17:01:52 +01:00
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
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
071745007a Partial port of Phoenix Windlight parts 2012-02-01 06:36:10 +01: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
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