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

6293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Latif Khalifa
ad03c27805 Tell cmake to only search paths we tell it to 2013-02-27 00:49:51 +01:00
Siana Gearz
c9ab38d449 Stream frequency change support and new anti-starvation strategy 2013-02-26 23:13:39 +01:00
Lirusaito
cef61db77f Feature Request: Add debug setting for showing Position Before Parcel in the Status Bar 
Adds StatusBarPositionBeforeParcel
Enables builders on parcels with keywords in their names to see their position.
 2013-02-26 16:59:35 -05:00
Lirusaito
c0c32c4b70 Minimal update of llpanelgrouproles.cpp to get the owner role checkbox to enable properly. 2013-02-26 16:56:59 -05:00
Lirusaito
620849607e Fulfill feature request: Optionally, don't ShowDisplayNameChanges in notifications. 
Show display name changes checkbox added to Adv. Chat->Chat/IM tab.
Better viewed without space changes.
 2013-02-26 16:35:02 -05:00
Lirusaito
180d1862a8 Dim seconds text in general preferences when AllowIdleAFK is false. 2013-02-26 16:07:21 -05:00
Siana Gearz
6ee8cc5798 Unbreak skinning on low end hardware 2013-02-26 20:47:43 +01:00
Siana Gearz
f3b7102034 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-02-26 00:23:35 +01:00
Siana Gearz
13e0bc2742 Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/lldrawable.cpp
	indra/newview/llviewerwindow.cpp
 2013-02-26 00:20:26 +01:00
Siana Gearz
a4b49e3fc2 Random stab at object updates. Tell me if it breaks anything. 2013-02-26 00:00:45 +01:00
Siana Gearz
e2659b801a Dirty fix object import 2013-02-25 23:58:43 +01:00
Lirusaito
c3e63e7ab7 handleLocalChatBar visibility whenever ShowLocalChatFloaterBar changes value 2013-02-25 17:39:53 -05:00
Shyotl
d27b329afb Minor bit of cleanup. Also now using glTexGenf instead of glTexGeni for fixed-function water texcoords. 2013-02-25 13:02:22 -06:00
Shyotl
e187e642c0 Restored some RLVa shownames logic that was clobbered a while ago. 2013-02-25 13:00:07 -06:00
Shyotl
fd21197d2a Wedged high-res non-tiled deferred snapshot logic into LLViewerWindow::rawRawSnapshot 2013-02-25 12:59:17 -06:00
Shyotl
34cf0329ab Crahfix for avatars, as destruction can be delayed via llpointer refs, meaning the region the av was in could be long gone before the avs destructor is actually called. Calling logPendingPhases in a more reasonable place (markDead). 2013-02-25 12:55:50 -06:00
Shyotl
94a0040ddb Sunshine catchup. 2013-02-25 12:53:18 -06:00
Lirusaito
9d6d8da54d Missed a spot in last commit. 2013-02-24 16:50:11 -05:00
Lirusaito
8e08e98c61 Only don't ShowLocalChatFloaterBar when Local Chat is torn-off. (Setting no longer requires relog) 2013-02-24 15:23:52 -05:00
Melanie
3036f74b69 Send the currently selected object list in the custom menu options request so that options can be created that operate on items. 2013-02-24 11:03:14 -05:00
Lirusaito
2ad9476961 Support SimulatorFeature MarketplaceURL for Marketplace Search tab on non-SL grids. 2013-02-24 10:54:46 -05:00
Aleric Inglewood
13e032fb04 Make AICurlThread::wakeup_thread thread-safe. 2013-02-23 23:29:43 +01:00
Aleric Inglewood
803e92020b Renamed AICurlThread::mWakeUpMutex --> AICurlThread::mWakeUpFlagMutex 2013-02-23 23:23:48 +01:00
Aleric Inglewood
b6cbed838f Assertion bug fix for libcwd with dc::curl on and curlio off. 2013-02-23 21:37:07 +01:00
Aleric Inglewood
19314b6686 Removed two unnecessary states from AICurlEasyRequestStateMachine 
Removed AICurlEasyRequestStateMachine_added and
AICurlEasyRequestStateMachine_finished because the state machine is not
taking any action there anyway, and those states might be skipped all
together even, so they make no sense / shouldn't exist.
 2013-02-23 21:33:37 +01:00
Aleric Inglewood
5d329d9e55 Fix initialization list order. 
Also fixes a Dout line and initializes mState to 0 so
that if ever set_state would be called first from
a non-main thread then it will be larger (probably
not needed currently).
 2013-02-23 21:13:26 +01:00
Aleric Inglewood
4851cc174e Revert "Work in progress" 
This reverts commit ef35aa7954
because it contained too much wrong things that I won't be
using. I'll re-commit stuff from it after that that I do
want to keep.
 2013-02-23 20:00:13 +01:00
Aleric Inglewood
78bb94eb42 Bug fix: remove remainder of test code 2013-02-23 19:36:18 +01:00
Lirusaito
c6aa1bb3ea French network preferences update 2013-02-21 04:42:27 -05:00
Lirusaito
489f17b6b2 Fix compile warning 'unused variable' 2013-02-21 02:18:45 -05:00
Latif Khalifa
b2b24cee7a Compile fix 2013-02-21 01:11:03 +01:00
Aleric Inglewood
ef35aa7954 Work in progress 
This work extends AIStateMachine to run multiplex() in the thread
that calls run(), cont() or set_state(). Note that all three
eventually call locked_cont(), so thats where multiplex() is called
from. Calling multiplex() means "running the state machine", as in
"calling multiplex_impl".

Currently only LLURLRequest uses this feature, and then only
for the HTTPGetResponder, and well only for the initializing,
start up and normal finish states.

A current/remaining problem is that we run into a situation where
the curl thread runs a statemachine to it's finish and kills it,
while the main thread is also 'running' it and tries to call
multiplex while the statemachine isn't running anymore.
 2013-02-20 23:29:38 +01:00
Siana Gearz
8f5c58ff3c Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer 2013-02-20 21:21:15 +01:00
Siana Gearz
408811c319 Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer 2013-02-20 21:20:22 +01:00
Siana Gearz
1555d70230 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-02-20 21:19:39 +01:00
Lirusaito
b9da20f0d6 Added new controls to Network Preferences 
Adds Texture Bandwidth slider
Adds Use HTTP for Inventory and Textures checkboxes.
Also, swaps out the bandwidth slider for a new Z Offset slider on quick settings, as bandwidth sliders should be set and forget, there is no modern need for them to be changed so frequently.

[Note to translators: please examine the network preferences after this update, controls have been moved and may now overlap.]
 2013-02-20 06:16:53 -05:00
Shyotl
041481db89 Snap grid was pulling colors from wrong control group. 2013-02-19 22:33:31 -06:00
Shyotl
beeef8d5b9 Fix crash if periodic av metric update happens after disconnect. 2013-02-19 21:54:35 -06:00
Shyotl
8d09539fcc Added a couple missing entries to settings.xml 2013-02-19 21:52:13 -06:00
Shyotl
07bc115b1c Stars had nonsensical and broken face winding. 2013-02-19 20:58:13 -06:00
Siana Gearz
00cb7a0e51 Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer 2013-02-19 21:12:14 +01:00
Siana Gearz
657484fedc Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer 2013-02-19 21:10:40 +01:00
Siana Gearz
3b86a39293 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-02-19 21:10:06 +01:00
Lirusaito
49eb78db27 Added the ever-requested marketplace tab to search floater (When on SL Grids, only) 2013-02-19 08:40:12 -05:00
Shyotl
dbf646f266 More verbose fmodex llinfos output upon init. (will be useful when I add more output options.. if we keep fmodex) 2013-02-19 01:52:29 -06:00
Shyotl
76f3dc9e19 Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback. 2013-02-19 01:50:46 -06:00
Melanie
994dfc5b29 Simplify the previous commit because commit callback for buttons is now 
identical to the clicked callback, obviating the need to distinguish between
these control types.
 2013-02-18 23:21:00 -05:00
Melanie
2b9c0e34c7 Fix the Octopus to not segfault anymore 2013-02-18 21:54:16 -05:00
Lirusaito
4c33328906 If RLVa is off, RLVa z offset should not be enforced. 
Easier diff view without space changes.
 2013-02-18 17:57:40 -05:00
Aleric Inglewood
ff3910a705 Merge remote-tracking branch 'singu/master' 2013-02-18 15:38:58 +01:00