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

4067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aleric Inglewood
39f8deb498 Merge remote-tracking branch 'siana/master' 2012-02-19 23:54:59 +01:00
Drake Arconis
665569dfc7 I forgot why I made these. 2012-02-19 17:07:42 -05:00
Drake Arconis
19f72cf967 Merge remote-tracking branch 'upstream/master' 2012-02-19 16:16:34 -05:00
Drake Arconis
a4363de59e Updated APR and Zlib prebuilts. 2012-02-19 15:59:47 -05:00
Siana Gearz
c3aa321d51 Fix classic skin 2012-02-19 21:43:31 +01:00
Shyotl
cf4b8cf263 Added LLView::translateIntoRectWithExclusion utility function. 2012-02-19 13:11:52 -06:00
Siana Gearz
9b268c3654 Fixing the crash in grid list 2012-02-19 20:07:17 +01:00
Drake Arconis
925c42294f OS X Builds now. 
Fixed building on OS X.
Fixed line endings.
Need to find better way to do fmodwrapper thing.
 2012-02-19 11:30:27 -05:00
Drake Arconis
23811df3cf Adding to Ignore. 2012-02-19 06:43:04 -05:00
Siana Gearz
f7cc9c4d33 Hopefully more correctness in grid manager editor 2012-02-19 00:42:23 +01:00
Aleric Inglewood
66ccff964b Comment out old Google Translate support and as such remove the need for JSON. 
Note that on standalone, json headers are installed in json/,
no idea why in the packages this isn't the case... But anyway,
it isn't used at all anymore now so it doesn't really matter.

I didn't remove the json package for non-standalone and the
downloading thereof... (I can't test non-standalone).
 2012-02-18 16:45:11 +01:00
Shyotl
b0240320ee Inv menus appear now. Still need to update llmenugl and its variants, since our current version is buggy. Also need to look into why inventory postfixes aren't appearing. 2012-02-18 01:59:02 -06:00
Shyotl
1810a7c7f9 Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there. 2012-02-18 01:58:02 -06:00
Aleric Inglewood
0c82b8bd3a Merge remote-tracking branch 'siana/master' 2012-02-18 02:23:26 +01:00
Aleric Inglewood
4e8b69206c LLViewerRegion: now compiles and seems to work. 2012-02-18 02:22:49 +01:00
Aleric Inglewood
0a7fc0e65e LLViewerRegion WIP: brought LLTrans up to speed with V3. 2012-02-18 02:22:49 +01:00
Aleric Inglewood
787e03e821 LLViewerRegion WIP: Sync indra/llmessage/llregionflags.h with V3 
It seems a few flags disappeared; adjusted the code accordingly.
Should do the same as V3 now.
 2012-02-18 02:22:49 +01:00
Aleric Inglewood
f381b0c2dd LLViewerRegion WIP: Use LLViewerRegion::getCapAPI 
Viewer 3 uses this in LLAgent::setStartPosition and
copy_inventory_from_notecard; so I brought those
up to speed with V3.

The viewer now uses LLViewerRegion::getCapAPI in all
the same place as V3.
 2012-02-18 02:22:49 +01:00
Aleric Inglewood
b8744b9e6a LLViewerRegion WIP: Added all headers that are dragged in. 
Most in particular llevents.h, which comes along with
the demand that the old events in llevent.h are put
in a namespace LLOldEvents. Made all changes necessary
to compile the rest of the code again (without changing
the actual code: it's still using the old events).

This patch also removes LLStopWhenHandled and LLStandardSignal
from indra/llui/llnotifications.h because those are
moved to llevents.h. That seems to be the only change
to indra/llui/llnotifications.h that isn't floater related,
so I left the rest of that file alone.
 2012-02-18 02:22:49 +01:00
Aleric Inglewood
59ee1a1041 LLViewerRegion WIP: Initial copy of llviewerregion.cpp 
This is basically the changes in viewer 3 to this file,
except that I left alone:

1) We still have a cloud layer (mCloudLayer)
2) LLViewerRegion::regionFlagsToString still adds comma's
   and a lot more flags.
3) We still have the extra accessor LLViewerRegion::getNetDetailsForLCD()
4) The actual capabilities requested in LLViewerRegionImpl::buildCapabilityNames
   have been left alone and still request the same caps as before.
5) LLViewerRegion::meshUploadEnabled and LLViewerRegion::meshRezEnabled
   have been left alone. They seems to do more work in our case,
   checking if we have the capability SimulatorFeatures, and doing
   something smart when that is not the case.
 2012-02-18 02:22:48 +01:00
Aleric Inglewood
88d0983e37 LLViewerRegion WIP: this should compile now. 2012-02-18 02:22:48 +01:00
Aleric Inglewood
3680e022fc LLViewerRegion: WIP - header changes and anticipated compile fixes 
Does not compile now.
llviewerregion.cpp wasn't touched.
Other changes elsewhere in the code (like in llstartup.cpp) might still be needed.
 2012-02-18 02:22:27 +01:00
Siana Gearz
a642b725e0 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-02-17 16:00:00 +01:00
Siana Gearz
dbc3a8c65f Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-02-17 15:59:16 +01:00
Siana Gearz
86cafba0df Linux fixes by Tofu 2012-02-17 15:57:21 +01:00
Siana Gearz
60ded2ad14 Initial invisiprim support in deferred 2012-02-17 05:52:41 +01:00
Lirusaito
fa560a7081 Fixed up a few settings' strings to display more correct descriptions for ascent settings in debug settings. 2012-02-16 23:10:20 -05:00
Shyotl
ae7b12f230 Interim commit before diving into reworking the inventory panel. 2012-02-16 19:25:59 -06:00
Lirusaito
5023f23cc4 Alt-H for Teleport History, like Phoenix. 2012-02-16 20:09:30 -05:00
Lirusaito
0fef1407e3 Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor. 
Black is a far better color for white text to sit on than the former
harsh tan. This will allow users to read notifications like the ones
from changing server versions.
 2012-02-16 19:40:36 -05:00
Lirusaito
a09c505fa0 The search line_editor in the status bar needed to be about 20% taller. 2012-02-16 18:28:50 -05:00
Lirusaito
023909b8e0 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-16 16:00:27 -05:00
Shyotl
a90d7bbb46 Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables. 2012-02-16 12:00:38 -06:00
Siana Gearz
60081d7ed5 Melanie's fix of FMOD on OS X 2012-02-16 13:23:00 +01:00
Lirusaito
0b5235d054 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-15 23:13:52 -05:00
Siana Gearz
071554acae Prim blacklisting on derender from Phoenix 2012-02-16 05:02:52 +01:00
Aleric Inglewood
f05343dec1 New libcwd debug channel CAPS. 2012-02-16 02:30:14 +01:00
Lirusaito
a403cef605 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-02-15 20:20:49 -05:00
Aleric Inglewood
9b4b234c12 Allow AIStateMachine::kill to be called while not running. 
This can be used for example when a parent statemachine has
a child statemachine and wants to kill() it upon finish.
 2012-02-16 01:10:48 +01:00
Aleric Inglewood
42518dbfaa This fixes a compile error under certain conditions for me. 2012-02-15 20:22:41 +01:00
Aleric Inglewood
4e700a5808 Merge remote-tracking branch 'siana/master' 2012-02-15 20:20:56 +01:00
Siana Gearz
647af6c15a RLVa: fix drag and drop on inventory items 2012-02-15 16:28:17 +01:00
Siana Gearz
b91ba258e1 Make double click more humane on X11 2012-02-15 14:45:09 +01:00
Siana Gearz
fe579d6e4b Activity/spam radar enhancement, from Avination 2012-02-15 14:07:03 +01:00
Lirusaito
6d3044b448 Merge branch 'master' of git://github.com/siana/SingularityViewer 2012-02-14 23:48:13 -05:00
Lirusaito
db8564bb3c Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-02-14 23:48:08 -05:00
Siana Gearz
28f73d1037 Fix large chat font being same as medium 2012-02-15 04:41:51 +01:00
Siana Gearz
dd9196efac Fix texture preview showing useless inventory UUID 2012-02-15 01:07:41 +01:00
Siana Gearz
c542c7bdbb Work around pink textures on ATI with 3.1<=GL<=3.2 2012-02-15 01:01:11 +01:00
Siana Gearz
f8aad35775 Skinning and cloth settings realigned properly 2012-02-14 21:29:22 +01:00