Aleric Inglewood
0c82b8bd3a
Merge remote-tracking branch 'siana/master'
2012-02-18 02:23:26 +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
Siana Gearz
071554acae
Prim blacklisting on derender from Phoenix
2012-02-16 05:02:52 +01:00
Siana Gearz
3d40cd86ac
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-02-05 15:14:53 +01:00
Siana Gearz
071745007a
Partial port of Phoenix Windlight parts
2012-02-01 06:36:10 +01:00
Shyotl
a0c549534f
Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory).
2012-01-29 17:10:04 -06:00
Shyotl
9453c2c2e9
Memory tracking system updated.
2012-01-29 01:33:14 -06:00
Shyotl
fc65380f2a
Added auto avatar muting(appearance only) based on avatar complexity (disabled by default). Added several missing debug views.
2012-01-27 02:36:26 -06:00
Siana Gearz
7fec659979
Update RLVa to 1.4.0-compatible
2012-01-25 21:11:33 +01:00
Shyotl
51746dc751
Added wearable index handling to LLAgentWearables to scope out further changes. Index is still always zero for now, so behavior should not have changed. (marked with // TODO: MULTI-WEARABLE)
2012-01-21 19:02:19 -06:00
Shyotl
4a4b786a60
New inventory observer implementation.
2012-01-21 04:54:39 -06:00
Lirusaito
9d3b276f61
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-12 23:39:16 -05:00
Shyotl
1cc33caaa3
Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions
2012-01-12 18:57:10 -06:00
Lirusaito
621e677898
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-07 17:09:43 -05:00
Lirusaito
566152c230
Almost completely stripped, saving the final piece for tomorrow
...
((Double clicking from list of chat people on right of chats))
2012-01-05 21:56:48 -05:00
Shyotl
a3f7399d7d
Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported).
2012-01-03 20:27:56 -06:00
Siana Gearz
fd22d80dfd
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
indra/newview/llmanipscale.cpp
indra/newview/llmeshrepository.cpp
indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
Siana Gearz
697dd7e929
Preparing to add mesh upload.
2011-12-03 03:43:23 +01:00
Brett Murphy
c5abde1616
added ctrl-alt-p option for phantom avatar
2011-10-27 22:32:38 +02:00
Shyotl
7bbbfd9a9b
Added avatar visibility and sound settings to 'About Land' floater.
2011-10-13 03:22:50 -05:00
Shyotl
36e0f667d5
gAgent.set/getInventoryRootID() changed to gInventory.set/getRootFolderID()
2011-10-12 02:29:12 -05:00
Shyotl
819fc39f1e
Multi-wearable prep: Updated LLAgentWearables and LLWearable. ItemId<->wearable association moved into individual LLWearables and out of LLAgentWearables. Wearables should now have their name field updated with their parent items name more reliably now, as well.
2011-10-10 00:22:37 -05:00
Shyotl
bf0bb8d59a
More dead code (renderforselect) removal.
2011-10-08 02:56:39 -05:00
Shyotl
cd86b3a69b
Refactoring.
...
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions.
-LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions.
-LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines.
-LLWearable WearableType conversions yanked. Use LLWearableType.
-LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines.
-EWearableType now LLWearableType::EType
-LLWearable::getID() renamed to LLWearable::getAssetID()
VOAvatar cleanup.
-Removed redundant TEWearable functions.
-Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change.
-LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
2011-10-03 15:00:43 -05:00
Shyotl
74dc875a27
Beginning to pull LLVOAvatarSelf out from LLVOAvatar.
2011-10-02 02:51:10 -05:00
Shyotl
417f5084b4
Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.
2011-09-03 19:30:42 -05:00
Shyotl
443d4e9f56
Windlight/water parameter managers now derived from standard LLSingleton instead of using some silly redundant clone.
2011-09-02 06:35:53 -05:00
Shyotl
c66065b688
CachedControl cleanup in random places. LL's ctor format is supported, so using such in LL code to ease diffs.
2011-08-28 01:04:30 -05:00
Shyotl
1f187b09ee
LLCommon cleanup and updating to V2 (V3 now, I guess.)
2011-08-27 01:57:10 -05:00
Shyotl
863ab7fa6b
Updated LLViewerParcelMgr.
...
Added LLViewerParcelMgr::setTeleportFinishedCallback, setTeleportFailedCallback. Not hooked into anything yet, however.
agentCanBuild, agentCanFly, etc, renamed.
2011-08-19 02:15:22 -05:00
Shyotl
1c38d016d5
Removed old RLV code. Plugged holes with RLVa.
2011-08-14 02:33:57 -05:00
Siana Gearz
aa469d860f
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
2011-08-01 19:56:33 +02:00
Shyotl
17bb0799e0
Added LLAgentUI. Includes improved buildLocationString.
2011-07-31 19:05:53 -05:00
Siana Gearz
f30c284063
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/llvfs/lldiriterator.cpp
indra/newview/app_settings/settings.xml
indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
Siana Gearz
2dd733cbaa
Merge branch 'master' into future
2011-07-20 22:12:14 +02:00
Shyotl
2870d44824
Teleport history now saved to teleport_history.xml. TeleportHistoryMaxEntries specifies how many entries to allow in floater before old entries are dropped.
2011-07-16 23:32:01 -05:00
Shyotl
7e0ee6bb71
Shiny new name cache.
2011-07-15 00:21:38 -05:00
Siana Gearz
cf81a4457e
This fixes exporter
2011-07-12 04:23:48 +02:00
Siana Gearz
6348635d3f
Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl)
2011-06-23 21:11:52 +02:00
Aleric Inglewood
a8d71f2550
Merge remote-tracking branch 'origin/master'
2011-06-14 16:02:43 +02:00
Shyotl
c57b97c8df
LLAgentWearables Transition (1/1)
2011-06-09 01:35:49 -05:00
Shyotl
b691e2b286
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
2011-06-08 14:19:43 -05:00
Shyotl
a07e399801
LLAgentCamera transition (1/2)
2011-06-07 21:35:10 -05:00
Siana Gearz
630059a74f
Merge git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/newview/llpaneldisplay.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2011-06-05 19:56:46 +02:00
Aleric Inglewood
fed8951e00
Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer
2011-06-03 22:48:23 +02:00
Shyotl
fef7ce9f76
Updated LLSelectMgr
2011-05-30 19:56:00 -05:00
TighMacFanatic
b7a697bcf9
Merge branch 'PrefsUpdate'
2011-05-29 20:23:59 -04:00
TighMacFanatic
abf5f09a46
Removed uncalled function.
2011-05-29 20:22:02 -04:00
Shyotl
71eec1caed
Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred.
2011-05-28 01:46:11 -05:00