Lirusaito
7599b00a13
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-21 22:04:46 -04:00
Lirusaito
f5492144ad
Gesture Optimization Pass 2
2019-03-21 22:01:13 -04:00
Shyotl
d61f89e3c9
Defer bbox generation for rigged meshes until actually loaded. Fix math bug.
2019-03-21 17:22:33 -05:00
Lirusaito
879cd79fdc
Gesture UI optimization, first pass
2019-03-21 03:24:44 -04:00
Lirusaito
c2f15ff47c
[Joystick] Detect xBOx cOntrOLLers in ANY cAsE
2019-03-21 01:27:57 -04:00
Lirusaito
c9226f6b63
[Joystick] Use the button layout for the chosen controller type
...
Using the drop down now FORCES your controller to be detected
as your selection for the duration of the session until you choose another
2019-03-21 01:26:23 -04:00
Lirusaito
95ff7acd6d
[Joystick] Do the code better
2019-03-21 01:09:47 -04:00
Lirusaito
0673e70aca
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-20 20:24:46 -04:00
Shyotl
fd53ff014e
Minor bugfix.
2019-03-20 15:34:23 -05:00
Lirusaito
f5cbae3958
Support Halcyon as though it were opensim, for now.
2019-03-20 00:27:06 -04:00
Lirusaito
3f9f79c155
Fix an oopsie woopsie, thanks Shyotl
2019-03-19 21:09:26 -04:00
Lirusaito
3a5b8a1075
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-19 20:56:49 -04:00
Shyotl
5a9ad787d5
Made rigged matrix cache toggleable via setting, for testing. Speculative fix for hairbase incorrectly appearing on animesh.
2019-03-19 15:17:14 -05:00
Shyotl
7f7267027e
Merge remote-tracking branch 'liru/animesh' into animesh
2019-03-19 13:21:17 -05:00
Shyotl
c19ef521b3
Lazy micro opt.
2019-03-19 13:20:28 -05:00
Lirusaito
cfc71a47db
Fix up ShellEx
...
It's now crossplatform wrapper for std::system opening of a file/path/url.
It returns an int just like std::system, 0 means it worked.
It's static so you don't need to gViewerWindow->getWindow() anymore,
honestly it should've been static in the first place.
Clean up other code to use this function because duplicate code sucks.
# Conflicts:
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowsdl2.cpp
2019-03-19 02:43:35 -04:00
Lirusaito
573c493d5d
Prevent unused variable warning.
2019-03-18 18:14:06 -04:00
Lirusaito
c5329968f7
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
...
# Conflicts:
# indra/llcommon/llstring.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
2019-03-18 17:30:34 -04:00
Lirusaito
d235e045d8
Do better
2019-03-18 15:26:18 -04:00
Lirusaito
bb26127ed5
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2019-03-18 14:38:21 -04:00
Lirusaito
beddc1cb21
Avatar count on map tiles by default
2019-03-18 14:37:59 -04:00
Shyotl
30f6dc2b2d
Allow more than 2gigs of texture memory... Fix shader buggles.
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2019-03-18 00:16:34 -05:00
Shyotl
e0194d4d06
Allow more than 2gigs of texture memory... Fix shader buggles.
2019-03-18 00:11:24 -05:00
Shyotl
a224c392e8
Fixed a few remaining bugs. Including all settings.
2019-03-18 00:05:59 -05:00
Lirusaito
a6e08bfc0f
Try to do opensim login stuff if not secondlife, not just if opensim/wc
2019-03-17 19:26:25 -04:00
Lirusaito
b755880dd3
Fetch inventory via udp if http inventory is off
2019-03-17 17:49:58 -04:00
Shyotl
b082bce2b1
Fix build.
2019-03-17 15:40:55 -05:00
Lirusaito
1c13ace366
Let's be real about currency
...
Fixes grid response for real currency not being heeded in buy currency.
2019-03-17 14:29:45 -04:00
Lirusaito
da8692f6a3
Merge branch 'ManagedMarketplace' of https://github.com/DamianZhaoying/SingularityViewer into ManagedMarketplace
2019-03-17 13:34:00 -04:00
Shyotl
b81373366b
Animesh test changes. Also stop screwing with my commit messages, github.
2019-03-17 02:35:07 -05:00
Shyotl
aa37a0b539
Intermediary commit #3
2019-03-17 01:08:34 -05:00
Lirusaito
b71ee44505
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-17 00:22:55 -04:00
Lirusaito
dea8ac2cf8
Only tell the user that we're refreshing their balance on their actions
2019-03-16 23:02:24 -04:00
Shyotl
3a78568a6f
Intermediary commit #2 .
2019-03-16 21:35:33 -05:00
Lirusaito
6898697246
Be a gooder wlf
2019-03-16 21:47:32 -04:00
Lirusaito
820b223ea9
Deltek did a fix, thanks.
2019-03-16 21:46:16 -04:00
Lirusaito
769c6a2e03
Fix Region Restart floater not showing Region name
2019-03-16 20:32:23 -04:00
Lirusaito
7991a53f3b
Oh yeah, I did this...
2019-03-16 20:28:43 -04:00
Lirusaito
d1f386860c
Do not recenter the restart floater if it's been moved.
2019-03-16 20:28:15 -04:00
Lirusaito
eec7385045
[VMM] Fix the inventory key handling issue
...
Thanks for the help Router
2019-03-16 20:02:12 -04:00
Shyotl
2d8fbb89c9
Intermiediary commit.
2019-03-16 17:51:00 -05:00
Lirusaito
c260158a2c
Backport translatable not_online responses
...
Thanks for pointing this out, Damian
2019-03-14 02:23:06 -04:00
Lirusaito
3b654a0986
Be more like C++, please.
2019-03-13 20:27:52 -04:00
Damian Zhaoying
bd60dfb61d
Merge branch 'ManagedMarketplace' of https://github.com/Lirusaito/SingularityViewer into ManagedMarketplace
2019-03-13 20:40:39 -03:00
Damian Zhaoying
a07f90c158
Adding more news spanish translations
2019-03-13 20:40:02 -03:00
Lirusaito
9b6c34213b
[Voice] Volume numbers, not just a slider!
2019-03-13 19:27:56 -04:00
Lirusaito
c58df7a3d9
Make the viewer lighter by one or two BOOLs per slider!
2019-03-13 18:59:18 -04:00
Lirusaito
62462165b7
[Voice] Actually save the speaker volume settings.
2019-03-13 17:42:26 -04:00
Lirusaito
4069878d54
[VMM] Fix inventory management bug reported by Griss Alexandre
2019-03-13 16:34:31 -04:00
Lirusaito
72479ce61e
Fix warning, thanks for the heads up, Router!
2019-03-13 14:32:23 -04:00