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

1998 Commits

Author SHA1 Message Date
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
Aleric Inglewood
c02834b7e3 Use AIThreadSafeDC and _wat convention to simplify AIEvent. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
15fb0ac3aa Allow AIStateMachine::cont() to be called from another thread for an idle statemachine. 2012-06-27 04:27:08 +02:00
Aleric Inglewood
4391614d6e AIThreadSafe* update. 
Updated/added documentation.
Removed AIThreadSafeWindowsHack that annoyed me (fix your compiler).
Don't use 'static' in anonymous namespace.
Use the AIThreadSafe*DC variants for default constructed objects,
as opposed to the AITHREADSAFE* macro's.
 2012-06-27 04:27:07 +02:00
Aleric Inglewood
8f6dbfc399 Compile fix for standalone 2012-06-27 04:27:06 +02:00
Aleric Inglewood
eb7615ad57 Merge branch 'master' into V2MultiWear 2012-06-27 04:26:44 +02:00
Aleric Inglewood
7234e63ce1 Merge remote-tracking branch 'siana/master' 
Conflicts:
	indra/llrender/llvertexbuffer.cpp

Resolved: needed two casts for 64bit warning.
 2012-06-27 04:10:20 +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
ebf66ebe9d XML UI Enhancements 
Added History Button to group conferences and group chats.
Added Inventory Expand All icon and button added to inventory floater.
Thanks to Naudia Nadezda for pointing out that these parts of UI just work.
 2012-06-24 17:27:33 -04:00
Lirusaito
26810ff16a Fixed up Keywords 
Up to date definitions and reorganizations,
commented out constants that apparently don't exist.
Fixed Strings not highlighting by borrowing missing code from Phoenix.

Also, this fixes 1020 being treated as UnknownAltitude when not on SL grid
and cleans up the horrible tabbing/spacing mud in llfloateravatarlist.cpp
 2012-06-24 01:52:56 -04:00
Lirusaito
48a2d0497b Added Avatar Privacy icon 
Was requested, borrowed from Phoenix.
 2012-06-22 03:57:47 -04:00
Lirusaito
b02465822b Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-06-19 16:16:49 -04:00
Shyotl
a8ebd6eebb Fixed a nullptr that occasionally caused crashing on shutdown. 2012-06-19 14:31:03 -05:00
Lirusaito
56fb36bbfa Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-06-18 21:09:16 -04:00
Lirusaito
94eda3aa24 Compile fixies 2012-06-18 21:03:08 -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
b5535c9cc4 Fixed a couple formatting errors in menu_inventory.xml 2012-06-16 01:45:13 -05:00
Shyotl
4c45e9a9d1 Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals. 2012-06-15 09:51:11 -05:00
Shyotl
3796a216d2 Removed a few old settings from settings.xml. Added absent RenderAutoHideSurfaceAreaLimit setting. 2012-06-15 09:09:58 -05:00
Shyotl
21f7df0dcc Stuck a space between realname and legacy name so long names now are more likely to split between lines more elegantly. 2012-06-12 02:14:19 -05:00
Shyotl
5b4700a8ee Added RenderAutoHideSurfaceAreaLimit setting, and tweaked hud rendering(lighting issues) 2012-06-12 02:10:22 -05:00
Shyotl
0286c8bf55 Small GCC fix. 2012-06-11 07:18:05 -05:00
Shyotl
a399580c84 Stale/unloaded textures apparently sticking around. SH-3074 would probably explain better, but the issue is restricted as per usual. 2012-06-11 07:12:58 -05:00
Shyotl
349006637e LL has played with texture discard priority/bias. Giving it a trial here. 2012-06-11 07:04:02 -05:00
Shyotl
945c663359 Updated LLInventoryModelBackgroundFetch and LLInventoryModel(code migration) 2012-06-11 06:57:54 -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
Shyotl
57641db71b Added 'Move Forward' and 'Move Back' to multi-worn clothing context menus. 2012-06-11 06:43:05 -05:00
Shyotl
891d6d3448 Interim work on appearance editor. 2012-06-11 04:54:54 -05:00
Lirusaito
0ad533d94d STORM-1870 and Have a space before old names in parentheses, like V3. 
Also small fixes, some spelling, some important; synchronize with upstream a bit..
Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
 2012-06-09 17:07:20 -04: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
5ce477c7cc Removed redundant double-click-teleport logic. 2012-06-09 02:28:42 -05:00
Shyotl
1a217b23c6 SH-3065 Out-of-order operations on startup. http://hg.secondlife.com/viewer-beta/changeset/ecdfca07cbe3 2012-06-09 01:57:21 -05:00
Shyotl
bb8417d6be Added some missing settings pertaining to marketplace features. 2012-06-09 01:50:50 -05:00
Shyotl
5228aa7029 Updated LLMeshRepoThread. Hopefully a little more reliable. 2012-06-09 01:48:01 -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
Shyotl
fb1594535e Intermediate step in refactoring appearance panel 2012-06-02 17:32:19 -05:00
Lirusaito
73c05eff77 Cherry-pick of 24a7281bef42 from viewer-development, also added missing AttachmentDrop to notifications.xml 
simon@Simon-PC.lindenlab.com: MAINT-862 and ER-1781 : Sounds not playing the first time.  Reviewed by Kelly.
 2012-06-02 05:13:50 -04:00
Lirusaito
9835d3b27e Fix for invalid initialization error 2012-05-31 01:01:50 -04:00
Lirusaito
20f138b31f Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-30 21:16:27 -04:00
Shyotl
b15f2d1a56 Some elements were being incorrectly blocked by others in the customize floater. 2012-05-30 19:14:45 -05:00
Shyotl
f04aabde96 Updated client tagging system. Client tags only looked up in opensim, and most logic pulled out into its own singleton. 2012-05-30 19:14:11 -05:00
Lirusaito
c6120cd283 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-28 05:18:20 -04:00
Shyotl
51a4e4960f V3 merge. Added LLMainLoopRepeater repeater. Disabled FBOs for baking. Fixed typo in strings.xml. Setting ThrottleBandwidthKBPS was used in a few places that MainloopTimeoutDefault should have been. Better outdated driver detection for ATI hardware. 2012-05-28 03:59:19 -05:00
Shyotl
271883e737 'Voice Preferences->Device Settings' crashfix. (NullPtr) 2012-05-23 18:23:27 -05:00
Lirusaito
58c58dc845 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-23 03:46:48 -04:00
Shyotl
61013dd2ab Crashfix regarding LLViewerObject using released regions. V3 cherrypick. 2012-05-23 02:10:02 -05:00
Shyotl
a2649ceb5a Stab at fixing deferred snapshots. 2012-05-22 23:37:50 -05:00
Shyotl
eb562c2470 Updated deferred rendering (STORM-1819 Ternary/Graded shadows) 2012-05-22 23:36:38 -05:00
Shyotl
ae0804beea Trival V3 llmath merge. 2012-05-21 20:23:42 -05:00