Commit Graph

254 Commits

Author SHA1 Message Date
Siana Gearz
0130423d93 Rev changed grid management incompatibly -.- 2011-10-15 04:46:35 +02:00
Siana Gearz
591610f211 New tag list to include Radegast 2011-10-09 03:23:04 +02:00
Siana Gearz
7c53fec576 Merge commit 'fb05f258e41591d4ebd87ed4abf7725996984956' into future 2011-10-09 02:19:42 +02:00
RevolutionSmythe
d7c2701773 Fix the grass.xml so that they don't have odd names that show up in the UI. 2011-10-04 06:08:32 +02:00
Siana Gearz
0a9c611dfd Merge back the ability to select the tree (not just random, from Imprudence).
Conflicts:

	indra/newview/app_settings/settings.xml
	indra/newview/llfloatertools.cpp
2011-10-04 06:07:52 +02:00
Siana Gearz
9ac2c07f52 Merge https://github.com/PlayerDagostino/SingularityViewer into future
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
2011-10-03 16:10:35 +02: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
59d50f3062 Meshy update. Mostly related to cost calculations... mostly. 2011-08-28 04:05:36 -05:00
Shyotl
c66065b688 CachedControl cleanup in random places. LL's ctor format is supported, so using such in LL code to ease diffs. 2011-08-28 01:04:30 -05:00
Shyotl
9d40820937 New object/avatar interp. 2011-08-19 01:36:01 -05:00
Shyotl
20ef149dcb Added test setting 'ShyotlUseLegacyTextureBatching' to disable new texture indexing. The new indexing method requires heavy branching in shaders, which some hardware may not perfom well with. 2011-08-16 02:37:18 -05:00
Shyotl
f551294e66 Alphamasking migrated to shaders instead of using fixed-function. Very early code. Hasn't even made it into viewer-development yet. 2011-08-12 19:20:11 -05:00
Fritigern Gothly
fb05f258e4 Windlight presets from Phoenix, and from LL v3.0 2011-08-13 02:04:48 +02:00
Shyotl
c9860f7b66 Massive deferred update...
Plus renamed setupViewport to setup[2|3]DViewport.
Migrated mWindowRect to mWindowRectRaw, mVirtualWindowRect to mWindowRectScaled.
Slowly updating getwindow/getworldview calls to new v2 variants as I run across them.
Cleaned up ascent-related code in llmanip.cpp.
Impostor update tweaks.
Edgepatch water occlusion changes. (no patch flickering on edges of screen while moving camera)
2011-08-11 03:16:17 -05:00
Siana Gearz
c6e0c2f323 This should fix the settings 2011-08-11 00:53:17 +02:00
Siana Gearz
23c5d5dd48 Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future
Conflicts:
	indra/newview/lltexturefetch.cpp
2011-08-10 23:21:14 +02:00
Shyotl
ca328aec72 Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change) 2011-08-10 03:53:49 -05:00
Shyotl
9bda97786f Batch indexing/no-fixed-function WIP. 2011-08-09 01:11:05 -05:00
Siana Gearz
2e88db37ad Signed warning in texture fetcher 2011-08-07 22:32:07 +02:00
Shyotl
9aa26648c9 Added CurlUseMultipleThreads (requires restart to change) 2011-08-06 02:29:04 -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
7bcd259821 Added ShyotlRenderVBOStrideMode to toggle between strided and unstrided VBOs. 2011-08-05 19:24:17 -05:00
Siana Gearz
87070be7e3 Merge branch 'master' of github-siana:siana/SingularityViewer into future 2011-08-03 01:01:00 +02:00
Player Dagostino
bcc541f3f2 Fix a problem with the media filter not working properly when the user turns the streams on. Previously it only worked when the avatar tpd or the stream source changed. Also set the filter on by default. 2011-08-02 20:04:19 +02:00
Siana Gearz
aa469d860f Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-01 19:56:33 +02:00
Siana Gearz
fcd37f3a45 Linuxy fixes 2011-08-01 19:55:57 +02: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
2f571a0393 Signed cleanup on texture fetch and one login bug fix 2011-07-26 01:46:53 +02:00
Siana Gearz
dece627991 Merge git://github.com/AlericInglewood/SingularityViewer 2011-07-24 18:19:30 +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
Shyotl
179c1bcc0c Octree capacites/radii/distances definable via settings. 2011-07-19 03:42:30 -05:00
Shyotl
9e061d5e35 Apparently MacGL crashes on for loops of variable length. Also, cleaned up a few minor things. 2011-07-18 03:30:58 -05:00
Shyotl
2870d44824 Teleport history now saved to teleport_history.xml. TeleportHistoryMaxEntries specifies how many entries to allow in floater before old entries are dropped. 2011-07-16 23:32:01 -05:00
Aleric Inglewood
b6d5743ccb Fix highlighting of Radar and Snapshot toolbar buttons.
Thanks to Done Arun.
2011-07-16 17:20:07 +02:00
Shyotl
684484fd76 Added some missing settings and removed a bajillion old unused settings. 2011-07-13 04:01:12 -05:00
Siana Gearz
ecbb40b092 Whoops, deleted one too many 2011-07-13 10:35:36 +02:00
Siana Gearz
0fa9eef4b2 Double setting cleanup 2011-07-13 08:49:05 +02:00
Siana Gearz
379f4c63ec Zeus has been begging for this 2011-07-11 12:05:53 +02:00
Shyotl
c320429f41 Hack hackity hack... I mean fixed water-fog sign-error when cam approaches 0 z when using shaders. 2011-07-11 03:30:28 +02:00
Shyotl
e80cff77f0 Hack hackity hack... I mean fixed water-fog sign-error when cam approaches 0 z when using shaders. 2011-07-10 19:38:43 -05:00
Siana Gearz
59ec4eba2a HTTP texture get connection throttling 2011-07-10 19:49:48 +02:00
Siana Gearz
1907883e02 This fixes glow on OSX 2011-07-03 22:49:23 +02:00
Shyotl
378053bd48 two_sided_delimiter workaround (Broken comment blocks in LSL '/*comment*/') Didn't want to mess with the token class for one single case. This fix is pretty straight-forward and self-contained. 2011-06-25 00:28:28 -05:00
Siana Gearz
b73a9b9a34 Compensate for possible low LOD bit allocation shifts 2011-06-17 16:04:11 +02:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Shyotl
25bb20046b Added AllowLargeSounds setting to disable v2 sound-decode strictness
Conflicts:

	indra/newview/app_settings/settings.xml
2011-06-09 16:53:46 -05:00