Commit Graph

6597 Commits

Author SHA1 Message Date
Shyotl
3f3ead0988 Merge branch 'master' into AISv3-WIP
Conflicts:
	indra/newview/llinventorybridge.cpp
2015-06-27 01:30:28 -05:00
Shyotl
a380161283 Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045 2015-06-26 20:59:31 -05:00
Shyotl
1e488fef6d Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
Conflicts:
	indra/newview/llviewerregion.cpp
2015-06-26 20:38:43 -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
Inusaito Sayori
1368cd6816 Fix that thing that spammed Nomade. 2015-06-25 03:07:04 -04:00
Inusaito Sayori
b3b2da1428 [Radar] Reroute some code, optimize silly stuff away.
No more dead state, death is instant when you disappear
No more dependency on frame or life time, updates come from the sims.
No need to rate control anymore, ui removed.

RIP: My headphones, you were shortlived, but you served my ears well.
2015-06-25 02:57:48 -04:00
Inusaito Sayori
fdab6d0efb [RLVa] - changed : reimplemented the @adjustheight command using LL's new hover functionalit 2015-06-24 21:44:59 -04:00
Inusaito Sayori
91029955f6 In some cases, one may have modular outfits, added to each other; let it be so! 2015-06-19 22:46:56 -04:00
Inusaito Sayori
990b5f9bb4 Linux Build Foxes 2015-06-19 19:55:56 -04:00
Shyotl
09f4528bfb Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants. 2015-06-19 18:27:21 -05:00
Inusaito Sayori
8f2c92d198 Fix warnings. 2015-06-19 17:28:09 -04:00
Inusaito Sayori
b11511b7b9 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
2015-06-19 05:42:49 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Inusaito Sayori
2bd2a7a64b Sync with upstream to refix Issue 1946: Unable to view other Group Land info with Admin mode under builds 6xxx+
LL reverted a change they made during viewer-tiger, apparently. Silly LL.
2015-06-18 23:52:36 -04:00
Inusaito Sayori
0965bc576c Port alchemy fixy: Make the radar not spam the end-user on teleport
Thanks to Sim Federal of Alchemy Viewer Team
2015-06-18 23:52:26 -04:00
Inusaito Sayori
6b20a85071 Select Texture=>Select Face 2015-06-18 23:08:41 -04:00
Inusaito Sayori
fd070315e9 Fix Issue 1945: llListStatistics not recognized as a function 2015-06-11 19:48:20 -04:00
Inusaito Sayori
b3709a0343 Woops, unused variable! 2015-06-11 08:39:29 -04:00
Inusaito Sayori
b35d1b7005 Accept and respect Opensim's login response with "classified_fee" (otherwise assume 0 for opensim) 2015-06-10 13:47:06 -04:00
Inusaito Sayori
aad24fa5c5 Solve Issue 1944 by allowing classified fees >= 0 on opensim
Opensim really needs to broadcast minimum classified fee...
Meh, guess they'll have to enforce that on the server...
2015-06-08 09:26:22 -04:00
Inusaito Sayori
a0fb5cdaa7 [RLVa] Hide avatar-render-specific ui for people who are out of camavdist
Hides lookat lines, nametags, and overhead voice indicators for hidden avs.
While this isn't necessarily according to spec, this keeps the ui from looking out of place with no avatar to show with it

View without space changes? Meh, doesn't matter so much.
2015-06-04 12:21:49 -04:00
Inusaito Sayori
9f388fd7b8 [RLVa] If name or nametag restricted, camavdist restricted, rangefinder can only see within the limited distance.
(or in iff_range, if that's lower)
2015-06-04 09:51:35 -04:00
Inusaito Sayori
96e88b97ef [RLVa] When trapped in mouselook, avoid potential glitches and excess work if reset_view_final is called 2015-06-04 09:37:59 -04:00
Inusaito Sayori
63b67d62ef [RLVa] Fix things that weren't working (new commands with params)
Code cleanup, better word a comment or two
Don't claim to support camdraw* or camtextures commands until we actually do
2015-06-04 09:35:59 -04:00
Inusaito Sayori
e7a0867cf3 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2015-06-04 03:25:46 -04:00
Inusaito Sayori
e956b7da51 You threw your arms around us, in the hopes we wouldn't change
But we had to change some.
2015-06-03 18:13:26 -04:00
Shyotl
283f5298d5 Missed a line. This assert should only be evaluated when running in deferred. 2015-06-03 12:46:37 -05:00
Inusaito Sayori
2d6a400967 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2015-06-02 04:45:31 -04: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
Inusaito Sayori
1d2daaae71 [RLVa] @camunlock means no flycamming away from the avatar!! 2015-05-26 20:14:45 -04:00
Inusaito Sayori
46e9d874e0 [RLVa] Implement guts of @camdraw* 2015-05-26 07:51:05 -04:00
Inusaito Sayori
a9fd9e6f2a [RLVa] Cleanup for the last commits
camAvDist, camMax and camMin are now combined into:
-camPole: returns the saved pole of the highest degree
-updatePole: updates the saved pole to the highest degree when the related exception is changed
Poles are now cached in a map called m_Poles in the RlvHandler.
2015-05-26 07:50:21 -04:00
Inusaito Sayori
75ba6cc67d [RLVa] @camdistmax, @camdistmin
This needs testing, this all needs testing...
but hey, at least it's here, right?
2015-05-26 06:16:28 -04:00
Inusaito Sayori
1720f2ebe4 [RLVa] @camzoommax, @camzoommin
Reload current saved zoom for clamping when imposing this restriction, whether that be mouselook zoom or regular.
Also some code cleanup.
2015-05-26 05:34:05 -04:00
Inusaito Sayori
9616a43cb0 [RLVa] Implement core of @camdrawcolor, without actually hooking it up. 2015-05-26 02:50:24 -04:00
Inusaito Sayori
c42e501f6f [RLVa] @camavdist 2015-05-26 02:49:23 -04:00
Inusaito Sayori
210c97986d [RLVa] Rlv Options can be floats or LLColor3s too now. 2015-05-26 02:35:40 -04:00
Inusaito Sayori
323b49de17 [RLVa] @camunlock
Causes LLAgentCamera::unlockView() to not happen, this turns off camera orbits.
Enables sim camera constraints regardless of user preference.
Resets camera when turned on.
2015-05-26 01:05:37 -04:00
Inusaito Sayori
d81497d29f [RLVa] Skeleton for implementation of RLV 2.9 features. 2015-05-25 19:52:35 -04:00
Inusaito Sayori
e2347651e9 I dunno what this is... Code clean up? Sure. 2015-05-25 15:40:15 -04:00