Commit Graph

2587 Commits

Author SHA1 Message Date
Siana Gearz
ac2f3968c2 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-06-08 22:32:30 +02: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
Shyotl
063ce180d3 Fmodex stereo fallback wasn't done quite right. 2012-05-30 18:56:36 -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
Lirusaito
f9e40aedce Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-23 19:30:41 -04:00
Shyotl
271883e737 'Voice Preferences->Device Settings' crashfix. (NullPtr) 2012-05-23 18:23:27 -05:00
Lirusaito
7b2c4034f1 Fix for STORM-1854: Linux Viewer crashes on startup after update to Fontconfig 2.9.0
Thanks to Johnnie Carling
https://jira.secondlife.com/browse/STORM-1854?focusedCommentId=325106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-325106
2012-05-23 16:46:53 -04: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
Lirusaito
fa4ee55308 Nomade Zhao's 4 fixes for translation. Re: Issue 340
Conflicts:

	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
2012-05-17 18:49:01 -04:00
Lirusaito
e729bd80ce Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-05-17 02:09:20 -04:00
Shyotl
9eda9ad462 GCC doing its thing (by being picky). 2012-05-17 00:47:00 -05:00
Shyotl
dbe50efc10 Added 'make outfit' back to appearance editor. 2012-05-16 23:25:01 -05:00
Shyotl
d1540040a8 Added extra callback registering methods to LLUICtrl 2012-05-16 23:22:57 -05:00
Shyotl
bf28ce4239 Few nullchecks, and fixed broken logic in LLPanelAvatar::canClose() 2012-05-16 12:06:05 -05:00
Drake Arconis
8192b547a8 Merge branch 'V2MultiWear' into v2mwArx 2012-05-15 10:37:55 -04:00
Drake Arconis
8dc0e16f0a Modified wrapper script with new options for FMOD Ex 2012-05-15 10:37:33 -04:00
Drake Arconis
5a2d160ac4 Fixed FMOD Ex support under linux 2012-05-15 10:36:48 -04:00
Lirusaito
e20b383aa0 Small changes that seem to make clang happier. 2012-04-30 23:48:30 -04:00
Lirusaito
a82953d0d0 Few more GCC 4.7 fixes.
include unistd when not on windows.
2012-04-29 00:25:40 -04:00
Lirusaito
16c2235510 Fixed About Floater's background.
clear and transparent both refer to the same thing, code fix to reflect this.
2012-04-28 21:34:24 -04:00
Lirusaito
8e6063e7b9 Fixed compile errors for gcc4.7 (also reported by clang) 2012-04-28 21:29:52 -04:00
Lirusaito
4799899317 Fritigern's script updates, brought in!
Also more stray spaces removed with care~
2012-04-26 22:09:58 -04:00
Lirusaito
37d2e41618 Spelling fix.
appearance isn't spelled appearence
2012-04-25 05:00:02 -04:00
Lirusaito
fd183e01b5 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-24 21:33:52 -04:00
Shyotl
75ef768e7f Fixed alternate buildtool modes not being selectable (texture, scale, etc) 2012-04-24 17:12:54 -05:00
Shyotl
35bd8d90be Subpanels created through ui factorymap callbacks which also call LLUICtrlFactory::getInstance()->buildFloater in said callbacks (opposed to using the filename attrib due to that not supporting sub-factorymap callbacks) now get a position fixup determined by parents position attribs for that subpanel after being built. 2012-04-24 17:12:13 -05:00
Lirusaito
a5faea64d9 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-24 04:17:31 -04:00
Shyotl
e7649d8f1c Avoid re-issuing LLPanel::postBuild() needlessly. Essential to avoid callbacks being double-registered to ui element signals (eg, LLOverlayBar::toggleMusicPlay was being called twice per click). 2012-04-24 03:11:10 -05:00
Lirusaito
3eccd251c0 Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-22 21:36:59 -04:00
Shyotl
b3d91d816d Diagnostic llinfos spewage for attachment process. 2012-04-22 19:45:07 -05: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
Shyotl
71a29e347e Tweaked camera panning into appearance edit mode. 2012-04-22 12:52:25 -05:00
Shyotl
6b66c33b47 Killed some redundant code in customize floater. 2012-04-21 20:44:10 -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
Lirusaito
640d9489cb Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-04-21 12:03:42 -04:00
Siana Gearz
3d40f96dfe Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-04-21 13:19:02 +02:00
Siana Gearz
817085c172 Probably antivirus-friendlier SLPlugin
To detour SetUnhandledExceptionFilter to a dummy function, don't use WriteProcessMemory which
is usually used for inter-process writes and debugging. Instead, use more common technique
based on VirtualProtect.
2012-04-21 13:15:03 +02:00
Siana Gearz
5ce00cecef Fix crash in voice device set-up 2012-04-21 12:57:33 +02:00
Lirusaito
bb1d94ba0e Fix ambiguous overload in llstartup.cpp so the viewer compiles on linux 2012-04-20 17:26:44 -04:00