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

3834 Commits

Author SHA1 Message Date
Melanie
a2f7bee568 Extend the octopus to allow avatar pickers to be used. 2013-04-16 13:32:35 +02:00
Melanie
12b98eedbe Extend the octopus to allow avatar pickers to be used. 2013-04-16 13:20:24 +02:00
Latif Khalifa
97809b3a22 Merge remote-tracking branch 'melanie_t/master' 2013-04-16 12:53:37 +02:00
Melanie
ab2f06d64e Add some much needed parens 2013-04-16 12:50:22 +02:00
Melanie
ab29c73ff5 Hide the export check boxes when on SL. 2013-04-16 12:35:02 +02:00
Melanie
a52fdd0dd0 Extend the octopus to allow avatar pickers - step 1 2013-04-16 12:15:43 +02:00
Melanie
f921e551a2 Merge branch 'master' into Avination-4.0 2013-04-16 07:44:55 +02:00
Melanie
f960a79118 Kill some compiler warnings by removing three unused locals that were in there for debugging 2013-04-16 07:41:12 +02:00
Shyotl
a5dad6be5c UI cleanup. 
-Added ui-local transformation matrix.
-Gutted legacy commitcallbacks throughout ui widget ctors.
-Created filter_editor ui widget which issues commit on keypress
   -search_editor commits on focus loss/enter press
   -search_editor and filter_editor now have a built in 'x' button to clear text.
-LLComboBox::setPrearrangeCallback now uses boost::function
-LLComboBox::setTextEntryCallback now uses boost::function
-LLLineEditor::setKeystrokeCallback now uses boost::function
-LLLineEditor::setPrevalidate now uses boost::function
-LLPanel::childSetKeystrokeCallback removed
-LLPanel::childSetPrevalidate removed
-LLPanel::childSetActionTextbox now uses boost::function
-LLTextBox::setClickedCallback now uses boost::function
-LLTextEditor::setKeystrokeCallback added.
-Cleaned up JCFloaterAreaSearch
 2013-04-16 00:25:59 -05:00
Shyotl
4cbf8b16b6 Streaming FBO checkbox in preferences->graphics->advanced enable switch was inverted due to vbo rebuild being deferred to a later frame. 2013-04-16 00:21:12 -05:00
Latif Khalifa
c1d5f33a4c Merge remote-tracking branch 'shyotl/master' 2013-04-16 06:36:13 +02:00
Melanie
e897fbcea5 Merge branch 'master' into Avination-4.0 2013-04-16 05:46:43 +02:00
Melanie
158a434899 Set focus in all necessary ways, not just the keyboard alone, when tabs are changed by alt-arrows 2013-04-16 05:45:27 +02:00
Shyotl
fed6639e44 Renamed SHAlphaMaskMaxRMSE to SHAutoMaskMaxRMSE. Disabled alpha masking on attachments. 2013-04-15 18:16:12 -05:00
Shyotl
d51b0f8701 Tweaked alert dialogs. Clicking 'x' issues a response. Either 'close', 'cancel', 'ok' or a dummy 'close' which will result in LLNotification::getSelectedOption returning -1 in callback. Listed in order of preference. 2013-04-15 18:06:46 -05:00
Melanie
09965b0cdf Add support for Avination's "Upload Credits" 2013-04-15 15:55:46 +02:00
Latif Khalifa
adb535421d Fixed build with DEBUG_CURLIO defined 2013-04-13 22:08:19 +02:00
Melanie
0b70e32f15 Remove spammy debug - that part works now 2013-04-13 20:03:16 +02:00
Lirusaito
6f027c5535 commitCallbacks have the new value built in, let's not bother with childGetValue for the export check =^*^= 2013-04-13 20:03:05 +02:00
Lirusaito
2bc966ad24 Condensed export mask checks into boolean functions 
Thins out that overly thick block of checks in the middle of LLPanelPermissions::refresh
Also corrected incorrect log output, after First stage comes contents not textures, Melanie.
 2013-04-13 20:02:51 +02:00
Lirusaito
09e7017f06 Added handleVisibilityChange to LLPanelPermissions 
TODO: Find out if this change is worthwhile by checking for log spam
 2013-04-13 20:02:40 +02:00
Melanie
eacd1d7eb9 Fix export permission checks to look for face textures by asset ID 2013-04-13 20:01:57 +02:00
Melanie
469ef079b9 Fix export enable controls 2013-04-13 20:01:49 +02:00
Lirusaito
345c5c751c Space changes 2013-04-13 20:00:38 +02:00
Lirusaito
fd76b7bf20 Added simSupportsExport function 
Hide E and export checked from regions without export support
No longer allow PERM_EXPORT from being added to default everyone permission flags if it's not supported by the sim.
 2013-04-13 20:00:17 +02:00
Lirusaito
7e7190ce6e Such a silly mistake it's "checkbox allow export" not "checkbox export" 2013-04-13 19:59:47 +02:00
Lirusaito
5a8ab82257 Bit more cleanup in llpanelpermissions.cpp 2013-04-13 19:57:24 +02:00
Lirusaito
fec3b6c79f Space changes 2013-04-13 19:57:17 +02:00
Lirusaito
dd711d51c0 Clean up in llpanelpermissions.cpp 2013-04-13 19:57:08 +02:00
Lirusaito
d5e6f9950d Add Allow exportation checkbox to Default Upload Permissions floater. 
Setting is per account and defaults to false.
 2013-04-13 19:55:50 +02:00
Lirusaito
e7cf0b716d Permissions corrections. 2013-04-13 19:55:37 +02:00
Lirusaito
d269b66623 Space changes. 2013-04-13 19:54:41 +02:00
Lirusaito
9e6e801d49 Check if objects textures prevent it from being exportable. 2013-04-13 19:54:11 +02:00
Lirusaito
c67563dfe4 Bits and pieces 
Disable next owner perms boxes when PERM_EXPORT
Added checks disabling the export toggle conditionally.
All cases covered except textures, couldn't figure that one out...
Mind the TODO's in the diff..
 2013-04-13 19:53:58 +02:00
Lirusaito
11604ae5de Compile fixes.. I thought I'd done this... 2013-04-13 19:53:20 +02:00
Lirusaito
45f3a171be Enter PERM_EXPORT, stage right. 2013-04-13 19:53:02 +02:00
Lirusaito
15fea2ef54 Export perm added to UI! 
Code added, Along with all the potential PERM_EXPORT bits...
Actual PERM_EXPORT bit still needs to be added.
SimulatorFeature comes next.
 2013-04-13 19:52:44 +02:00
Latif Khalifa
3005b9dd2c Merge remote-tracking branch 'melanie_t/master' 2013-04-13 05:03:50 +02:00
Melanie
273f57d5a2 Fix chat focus issues once and for all 2013-04-13 04:59:02 +02:00
Lirusaito
8c49716eae Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting 
Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.
 2013-04-10 13:26:48 -04:00
Lirusaito
fd9f8fa71f Cleanup and Synchronization (pre-merge wrap-up commit) 2013-04-10 09:14:16 -04:00
Lirusaito
c2046025e3 Tiny fix to the Scripts sub-piemenu 2013-04-10 05:39:21 -04:00
Latif Khalifa
9f897f0e2c Merge remote-tracking branch 'upstream/release' 2013-04-09 19:52:13 +02:00
Drake Arconis
eb25270df0 Only Aurora supports not having a last name. So lets just default it to Resident. 2013-04-09 10:51:11 -04:00
Lirusaito
b909a70413 [Frosting] Feature Request: Add Scripts sub-piemenu 
Thanks in part to the FS team for already having something close, that made adding this all easier~
 2013-04-09 00:31:00 -04:00
Lirusaito
f11f6618ab [Frosting:268] Sit via self pie menu 2013-04-09 00:25:42 -04:00
Aleric Inglewood
fce106f7e2 PerHost became PerService 
Reflect the fact that we include port number in its name.
 2013-04-09 05:06:32 +02:00
Aleric Inglewood
bb948ce6d5 Use host:port as key for the "PerHost" request queue, instead of just the hostname. 
Rationale: LL is doing all throttling per service (host:port), not per
service hostname. Also, textures and capabilities use the same host: the
sim you are connected to. Splitting the queues up on a per-service basis
will stop the textures from blocking a capability request.
 2013-04-09 04:32:36 +02:00
Aleric Inglewood
3af89dd685 Temporarily add old bandwidth throttle method back. 2013-04-09 04:25:28 +02:00
Aleric Inglewood
748d339ee6 Move decision whether or not to add new HTTP request from texture fetcher to AICurl 
After commit things compile again :).
The HTTP bandwidth throttling is not yet implemented. I'll put a
temporary fix back the next commit that just does it the "old way"...
 2013-04-08 22:46:01 +02:00