Commit Graph

6544 Commits

Author SHA1 Message Date
Shyotl
a380161283 Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045 2015-06-26 20:59:31 -05:00
Shyotl
4d61305095 GCC fixup. 2015-06-26 01:40:01 -05:00
Shyotl
18c6330af7 Remove unused index_array pointer in LLFace::renderElements and LLFace::pushVertices 2015-06-25 20:24:25 -05:00
Shyotl
af81f692de Remove superfluous check in llfontgl. 2015-06-25 20:21:33 -05:00
Shyotl
ada7e3ca30 Make clang happier. 2015-06-25 20:19:55 -05:00
Shyotl
41357e579a Missed LLError::LLCallStacks::cleanup call on shutdown. 2015-06-25 20:19:26 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -05:00
Shyotl
09f4528bfb Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants. 2015-06-19 18:27:21 -05:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
283f5298d5 Missed a line. This assert should only be evaluated when running in deferred. 2015-06-03 12:46:37 -05:00
Shyotl
0688cda8d2 More thorough VBO teardown in resetVertexBuffers/stopGL. Also, found cases where gGL.init failed to be called when it should have been. 2015-06-01 17:58:19 -05:00
Shyotl
142322528c Use LLColor4U::white instead of LLColor4::white when assigning as vertex color. 2015-06-01 16:56:24 -05:00
Shyotl
7a9a4f3e1e Local light setting toggle behavior was incorrect with shaders enabled. 2015-06-01 16:54:36 -05:00
Shyotl
d140d28af9 Tangent vecs aren't needed for non-deferred bump pas. Omit unless deferred is enabled. 2015-06-01 16:53:29 -05:00
Shyotl
f2883801ec Harden context recreation texture handling. 2015-06-01 16:38:25 -05:00
Shyotl
c965df0901 3d perlin noise was not generating proper results. 2015-06-01 16:36:35 -05:00
Shyotl
a7ba5145cc Inline shader uniform setters, and cache values in vectors instead of maps. Also, deleted mUniformNameMap, mUniformNameMap, and uniform2i, as they were unused. 2015-05-23 17:16:02 -05:00
Shyotl
d4a56c6d94 Toss attachments into their own bridge that sets their type to TYPE_AVATAR, and use generic bridge for plain old 'active' volumes. Resolves issue where non-attached ACTIVE flagged linksets would be included in the avatar render type, and thus would vanish when such type was disabled. 2015-05-22 16:14:57 -05:00
Shyotl
af020ad558 LLViewerShaderMgr::setShaders() should be called unconditionally upon restoreGL. 2015-05-18 15:36:50 -05:00
Shyotl
55e3ddb465 Can't you just be happy GCC? It's all I've ever wanted. 2015-05-18 14:02:39 -05:00
Shyotl
690f3614c1 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
Conflicts:
	indra/llrender/llpostprocess.cpp
2015-05-16 02:53:19 -05:00
Shyotl
f827d77600 Verify CoInitialize call was successful (on Windows only). 2015-05-16 02:31:32 -05:00
Shyotl
48c0c6eb39 Format specifier %zu is invalid with visual studio. Use %Iu for that platform, instead. 2015-05-16 02:31:16 -05:00
Shyotl
966c5aa409 Remove redundant methods of checking if shaders are enabled. Just use LLGLSLShader::sNoFixedFunction. 2015-05-16 02:31:06 -05:00
Shyotl
2131067436 LLPerlin #include cleanup. 2015-05-16 02:30:57 -05:00
Shyotl
aa9cc7a50d Fixed div-by-zero issues in LLStat. 2015-05-16 02:30:36 -05:00
Shyotl
8943439629 Remove dupilicate perlin noise impl, and update the remaining one. 2015-05-16 02:30:32 -05:00
Inusaito Sayori
a4da61ae0b Ease up enable_move and enable_rotate restrictions in object tab of build tools.
Also cleans up duplicate logic

Explanation and Justification:
Move permission is needed to rotate and move
Move and rotate are actions you can perform via manip tools on attached linked prims already
This just enables the GUI controls for something that was already doable via other means such as mouse.
2015-05-15 02:07:35 -04:00
Inusaito Sayori
580a7a4599 Additional buttons was pushing text off the edge of area search, refresh and stop are now icons. 2015-05-15 01:07:57 -04:00
Inusaito Sayori
d02df9e451 Can minimize the local chat floater. 2015-05-15 01:06:31 -04:00
Inusaito Sayori
4e4dbd4012 Satisfy Issue 1916: Local Gesture Preview/Play
Adds a dropdown option to gesture preview button to preview locally.
Note that any chat commands in gestures will still work as they normally would!

Translators: do your thing or hold your peace. (floater_preview_gesture.xml)

These code changes will look nicer viewer without space changes~
2015-05-14 23:55:20 -04:00
Inusaito Sayori
8e05524027 Add TP and Look options to area search (happy now?) 2015-05-14 11:22:36 -04:00
Inusaito Sayori
67836ecf67 Actually, show the blue warning, it's intentional, it's only a warning.. 2015-05-14 09:31:15 -04:00
Inusaito Sayori
a974ca096c Allow setting the label of a flyout button dynamically in code. 2015-05-14 07:30:49 -04:00
Inusaito Sayori
361d3542a4 Fix that blue warning that annoyed Nomade. 2015-05-14 04:59:53 -04:00
Inusaito Sayori
1db2ffe02b Feature Request: Allow blocking conferences from nonfriends exclusively.
Option is in Communication tab, as the old one was.

Translators will need to localize this. (panel_preferences_im.xml)
2015-05-12 18:00:14 -04:00
Inusaito Sayori
235693f134 You're all so special. 2015-05-12 09:13:44 -04:00
Drake Arconis
1e0243aa3d Fix some 64bit-unsafe windows code 2015-05-12 09:11:59 -04:00
Inusaito Sayori
2631ae91e7 Sync notifications with upstream to fix Issue 1913: Unable to log in. ERROR 2015-05-07 09:33:30 -04:00
Inusaito Sayori
e71d94aa69 Words lie. People lie. The land tells the truth. 2015-05-05 20:35:01 -04:00
Inusaito Sayori
4b96251852 This is why we can have nice things. 2015-04-24 23:57:29 -04:00
Inusaito Sayori
193fc27ba2 Issue 1836: Autoresponse Improvement, adds World->Status->Autoresponse submenu
Moves Fake Away, Busy, and Away into a submenu of World called Status, from upstream.

Tweak to LLView::findControl to work with per account controls too.
TogglePerAccountControl added for when a control a menu is using is not in the main group.
2015-04-24 23:41:19 -04:00
Inusaito Sayori
a6ae79f9b1 Stylistic changes and whatnot for LLDropTarget what with setValue and setItem
Conflicts:
	indra/newview/lldroptarget.h
2015-04-24 19:15:17 -04:00
Inusaito Sayori
9ce9a1f472 LLDropTarget::mEntityID=>LLDropTarget::mID 2015-04-24 18:27:01 -04:00
Inusaito Sayori
b9a6fb8468 In pay floaters, display proper currency symbol on non-SL grids. 2015-04-23 23:56:01 -04:00
Inusaito Sayori
2cfc90736d Foxes don't have bedtimes. 2015-04-23 06:31:32 -04:00
Inusaito Sayori
886a05549d Fix alignment of Text Chat Preferences; bottom_delta > bottom 2015-04-19 19:26:51 -04:00
Inusaito Sayori
9f06333a86 Address Issue 1897: Pressing letter keys STARTS local chat
Option lives in Text Chat preferences. "Letter keys start typing into local chat"

Code is from upstream..ish
2015-04-19 18:59:17 -04:00
Inusaito Sayori
b28e4e06ae refresh_desktop_app_entry.sh lives in etc/ now, missed that spot.
Thanks to H-H-H for pointing this out.
2015-04-19 18:09:40 -04:00
Inusaito Sayori
8b7b0649a8 Uncomment use of etc/ for spawnWebBrowser on Linux, now that we use etc/ for scripts.
Thanks to H-H-H for pointing this out.
2015-04-19 18:08:49 -04:00