Commit Graph

1741 Commits

Author SHA1 Message Date
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
74dc875a27 Beginning to pull LLVOAvatarSelf out from LLVOAvatar. 2011-10-02 02:51:10 -05:00
TighMacFanatic
a1628abec3 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-09-27 12:56:04 -04:00
TighMacFanatic
3c758a06a3 Re-enabled Cancel TP button. 2011-09-27 12:37:02 -04:00
TighMacFanatic
344df747d5 Fixed text highlighting so terms found in names do not trigger. 2011-09-27 12:00:28 -04:00
Shyotl
21f39471f1 Allow muting of objects with no name through the chat display. 2011-09-25 18:19:27 -05:00
TighMacFanatic
00699801d2 Merge branch 'future' 2011-09-24 22:36:40 -04:00
TighMacFanatic
9b0723ec8d Merge branch 'future' of e:/SL_Dev/Shyotl into future 2011-09-24 21:24:58 -04:00
Shyotl
7f934f34f1 Minor renderer updates. 2011-09-23 00:55:24 -05:00
Shyotl
c621cb7719 Curl had some structures moved to the header. Also had an extra mutex added for locking multihandle. Includes MISC #include order cleanup. 2011-09-22 23:59:44 -05:00
TighMacFanatic
c466b9a91a Reverted code that allows users to steal UUID's of clothing textures. 2011-09-22 17:26:39 -04:00
Shyotl
381ef6fe70 GCC is just annoying sometimes. 2011-09-21 17:49:21 -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
0ace809572 Fixed pre-login shutdown crash due to unitialized variables 2011-09-19 20:12:24 -05:00
Shyotl
a9b8712aa5 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into future 2011-09-19 16:22:20 -05:00
Siana Gearz
aed345b2ff Don't mess up file perm on Linux 2011-09-19 03:26:53 +02:00
Siana Gearz
fb1b221378 Merge branch 'BatchIndexing' of https://github.com/Shyotl/SingularityViewer into future 2011-09-19 02:09:47 +02:00
Shyotl
7424bcee4b Added super-temporary debug settings to help determine cause of textures baking as solid white for some users. 2011-09-12 15:44:44 -05:00
Shyotl
1fb1ba05ce Optimization. Skip binding for rigged face types that have no faces to display. 2011-09-12 15:30:42 -05:00
Shyotl
3ba4861a3b Avatar alpha masking now works with hardware skinning when not using fixed-function pipeline. 2011-09-10 15:45:28 -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
87bada69fa GCC fixup 2011-09-09 14:42:59 -05:00
Shyotl
e5448533bf lltexturecache tinkering. 2011-09-09 14:40:44 -05:00
Shyotl
3b435fe056 Skip checkClientArrays if not using fixed-function 2011-09-09 14:39:44 -05:00
Shyotl
417f5084b4 Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places. 2011-09-03 19:30:42 -05:00
Shyotl
7b2aa741aa LLGestureManager renamed to LLGestureMgr. Also, derived from LLSingleton. 2011-09-03 06:46:47 -05:00
Shyotl
39b8abc4cf Tiny bit of lleventnotifier cleanup. Only functional difference is that server is notified when an event notification response is handled... also the notifier is deleted (leakfix? I can't find where it was deleted on this case before this new change).. 2011-09-03 06:05:23 -05:00
Shyotl
f36e1d23ea Mesh metrics bugfix. 2011-09-02 07:00:28 -05:00
Shyotl
d7370d23d2 Hopefully fixed bumpmaps not loading at full resolution. (SH-1069, but ll has tried to fix this a good 20 times previously, so...) 2011-09-02 07:00:10 -05:00
Shyotl
992319f667 Bumpmapping now appears on hud objects in deferred. 2011-09-02 06:57:15 -05:00
Shyotl
3c4f012480 LLVOVolume::lineSegmentIntersect crashfix. http://hg.secondlife.com/mesh-development/changeset/741175a108d1 2011-09-02 06:56:32 -05:00
Shyotl
443d4e9f56 Windlight/water parameter managers now derived from standard LLSingleton instead of using some silly redundant clone. 2011-09-02 06:35:53 -05:00
Shyotl
91cb401324 Don't use shaders for dynamic textures.... again. 2011-09-02 05:56:04 -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
2d0b2a82ef Updated GL and GLUT headers. Now separate archives, glext and freeglut(only used in test plugin?). 2011-09-01 00:14:40 -05:00
Shyotl
fd317a4092 newview V3 partial merge. 2011-08-30 01:05:59 -05:00
Shyotl
8d23a7d1d4 LLViewerTexture now has the ability to prevent raw images from being dumped for a specified period of time. Unused for now. Relates to mesh import. Also, BOOST_PREVIEW textures bumped to PO2. 2011-08-29 03:46:13 -05:00
Shyotl
baddb47c44 LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now. 2011-08-29 03:44:17 -05:00
Shyotl
c129a1a923 Small LLVFS (LLDirIterator specifically) tweak regarding path existance detection. 2011-08-29 03:35:08 -05:00
Shyotl
09fa7edc8d LLUI V3 (very)partial merge 2011-08-29 03:33:43 -05:00
Shyotl
aaa6417fb7 Tweak related to cubemaps. Missed this earlier. 2011-08-29 03:22:42 -05:00
Shyotl
2ff52baa20 LLMessage V3 partial merge. 2011-08-29 03:21:23 -05:00
Shyotl
60c122ee15 LLMath V3 partial merge. 2011-08-29 03:21:05 -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
7e9f8c7bf8 Several LLStat variables migrated into the LLViewerStats class. 2011-08-28 00:56:57 -05:00