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

2110 Commits

Author SHA1 Message Date
Aleric Inglewood
cd93aba002 Created aistatemachine library and moved files. 2012-07-29 01:30:10 +02:00
Aleric Inglewood
fb38f6adea Always write curl I/O debug info for the login attempt. 2012-07-21 21:51:24 +02:00
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
Shyotl
48ae0d003d Made the Visual Studio compiler a bit more happy with aicurl. 2012-07-17 18:04:48 -05:00
Aleric Inglewood
648ed00ce2 Don't call gSavedSettings.getU32() and calc_clock_frequency() so often anymore. 2012-07-17 19:58:34 +02:00
Aleric Inglewood
87c9358813 Add back erroneously removed comments. 2012-07-17 19:33:12 +02:00
Aleric Inglewood
64b968b262 process is no longer processing 2012-07-17 19:27:14 +02:00
Aleric Inglewood
900e533b4b Remove unused call to process(). 2012-07-17 08:01:06 +02:00
Aleric Inglewood
a34247ebf4 Bug fix. 
Don't test on something that belongs in an assert.
is_main_thread() doesn't even exist unless --type=Debug.
 2012-07-15 23:08:07 +02:00
Aleric Inglewood
7c022d6061 Don't crash on exit. 
When a new state machine was just created, so run() had already
been called but it never did really run yet so running() would
return false; then abort() wasn't called in flush(), causing
the subsequent mainloop call to actually try and startup the
state machine, which then crashed because Debug Settings
mechanism is already destroyed at that point (and in general,
we really don't want anything to run: it does unpredictable
things).

With this fix, also state machines that were just created are
aborted, resulting actuall in a kill without delete, and subsequently
a clean delete from the mainloop.
 2012-07-15 22:51:14 +02:00
TighMacFanatic
329b708aaf Fix History button in IM panel not working for non-Windows users. 2012-07-15 15:07:05 -04:00
TighMacFanatic
56c85813ee Fix History button on local chat not working for non-Windows users. 2012-07-15 14:25:10 -04:00
Siana Gearz
d5e685aaf2 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 2012-07-15 09:44:17 +02:00
Shyotl
08dd79fafd Recent occlusion changes rearing their head again. Fix a crash when graphics set to low. 2012-07-14 20:42:47 -05:00
Shyotl
fa9c366076 Fixed alpha textures not entering the alpha pool an alternative way. 2012-07-14 19:45:11 -05:00
Shyotl
08ab36a5d9 mPendingInventoryItemsIDs wasn't having entries removed. 2012-07-14 19:44:06 -05:00
Siana Gearz
c1c04b489c Revert "Possible fix for "No able to connect to SecondLife"" 
This reverts commit 66c95af093.
 2012-07-15 02:29:00 +02:00
Siana Gearz
0caa321fe5 Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer 2012-07-14 22:02:06 +02:00
Aleric Inglewood
66c95af093 Possible fix for "No able to connect to SecondLife" 2012-07-14 20:57:55 +02:00
Aleric Inglewood
7416d2aaf1 Timer, time out, and clean up improvements. 2012-07-14 04:29:37 +02:00
Siana Gearz
cb61342e58 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 2012-07-13 13:45:02 +02:00
Siana Gearz
d99de40b2b Suppress error prevalent on OSGrid 2012-07-13 13:44:46 +02:00
Shyotl
f8445030c7 Avoid making duplicate copies in item inventory when no-mod texture is dragged onto faces. 2012-07-12 16:33:05 -05:00
Shyotl
539b6410fa Brought back the inventory item count display after loading has completed. 2012-07-12 16:09:42 -05:00
Lirusaito
75f067d5c9 Added crossfade checkbox to Windlight remote panel. 2012-07-12 13:35:56 -04:00
Lirusaito
518e9b7513 Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-12 12:40:41 -04:00
Siana Gearz
0314bb4d38 Apparently Laika Tungsten's name is nhede Core 2012-07-12 18:34:49 +02:00
Siana Gearz
ddfe004204 Restore function of day cycle editor 2012-07-12 18:33:10 +02:00
Siana Gearz
07375e7a39 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llrender/llvertexbuffer.h
 2012-07-12 08:30:35 +02:00
Lirusaito
44b69f3d3e Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h Chose Shyotl's.
 2012-07-11 23:23:31 -04:00
Shyotl
bca4cf8584 Revert LLs recent VBO alterations, as they aren't proving to be all that great.. 2012-07-11 17:13:37 -05:00
Shyotl
4f3f503953 Recreate mDeferredVB on vertexbuffer reset. 
Shuffled some code from LLVOPartGroup::restoreGL() to LLVOPartGroup::destroyGL(), as it makes more sense there.
Bind the correct shader in wireframe..
glLineStipple call managed to sneak into no-fixed-function mode.
LLViewerWindow::initFonts was called frequently and redundantly during destroygl->restoregl transition.
 2012-07-11 17:12:40 -05:00
Lirusaito
1df635a164 Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-11 12:44:41 -04:00
Siana Gearz
f3ae5789be Fix mute in voice 2012-07-11 18:43:31 +02:00
Lirusaito
cf7cd21474 Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-11 12:37:37 -04:00
Lirusaito
0f8fbcfcc1 Disallow the user from self-muting and remove them from the mutelist if this was the case. 
Works around other viewers allowing the user to mute themself.
 2012-07-11 10:47:40 -04:00
Siana Gearz
a1f9109392 Don't try to HTTP inventory fetch when we can't 2012-07-11 14:54:20 +02:00
Siana Gearz
c648be6410 Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer 2012-07-11 07:38:58 +02:00
Lirusaito
6fa0b668ba Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer into V2MultiWear 2012-07-10 19:51:45 -04:00
TighMacFanatic
1925b24512 Fix "Enable highlighting of selected prims" so it actually does something. 2012-07-10 19:48:11 -04:00
Drake Arconis
1101b4075a Merge remote-tracking branch 'siana/master' into AltCompilers 2012-07-10 14:16:24 -04:00
Drake Arconis
edb144bd1d Fixed ugly workaround for compiler detection 
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
 2012-07-10 14:15:59 -04:00
Drake Arconis
bcefad1a97 Massive windlight preset cleanup and updates 
Cleaned up all duplicate windlight presets
Renamed windlight presets under correct current prefixes
Imported new presets from FS and Alchemy
 2012-07-10 14:14:31 -04:00
Siana Gearz
1b6ef97f45 Windows build fix 2012-07-10 14:55:16 +02:00
Siana Gearz
ce0e0a2d38 Fix editing artifact from about floater fudging 2012-07-10 14:17:18 +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
515b1488c6 Bumping the cache version 2012-07-10 06:14:07 +02:00
Siana Gearz
6868e2f7c1 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 2012-07-10 06:07:56 +02:00
Siana Gearz
c71c7ca7cc Make defaults less rude to others 2012-07-10 05:50:47 +02:00