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

1698 Commits

Author SHA1 Message Date
Siana Gearz
7c53fec576 Merge commit 'fb05f258e41591d4ebd87ed4abf7725996984956' into future 2011-10-09 02:19:42 +02:00
Bill Barnhill
851a80d266 Skip libfmodwrapper.dylib if it is not found (instead of erroring out of build); add missing enumeration values for media events to stubs 2011-10-09 02:17:07 +02:00
Siana Gearz
ff0c7a1925 Merge https://github.com/TighMacFanatic/SingularityViewer into future 
Conflicts:
	etc/message.xml
 2011-10-09 02:08:20 +02:00
Siana Gearz
afc91b76b0 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-09 02:03:08 +02:00
Shyotl
88df12ddb6 Attempt at a proper fix for attachments/orphan prims being drawn when they shouldn't be (setRegion is already called further down the update chain. Removed a excess call that probably is breaking things.). 2011-10-08 03:11:28 -05:00
Shyotl
9194d5bfcd Mesh-related updates. In particular, cleanupAttachedMesh wasn't called! 2011-10-08 03:07:32 -05:00
Shyotl
d9d3ff0057 Disable updateTextures entirely for non-visible avatars (culled ones still need updating tho.) 2011-10-08 03:06:41 -05:00
Shyotl
01e10b5087 Let gAgentAvatar be killed on shutdown. 2011-10-08 03:03:11 -05:00
Shyotl
464b16e621 Code consolidation. Redundant code moved into single function (checkMediaURL). 2011-10-08 03:01:32 -05:00
Shyotl
4b08f52332 Disconnected background was double-displayed. 2011-10-08 03:00:10 -05:00
Shyotl
42938abf9b Static VFS now supported for gAssetStorage lookup. 2011-10-08 02:59:47 -05:00
Shyotl
5e829b7a3a LLRender's vertexbuffer created via init now, instead of ctor. Allows deallocation/reallocation. 2011-10-08 02:58:23 -05:00
Shyotl
418d80197e LLVOAvatar::getFullname() now using LLCacheName::buildFullName 2011-10-08 02:57:30 -05:00
Shyotl
bf0bb8d59a More dead code (renderforselect) removal. 2011-10-08 02:56:39 -05:00
Shyotl
02c2283e11 Cleanup. Mostly harmless. A few gAgentAvatarps changed to isAgentAvatarValid(), which is the only 'change' in behavior. Everything else is insignifigant syntax touchup and shuffling of inlines from headers to cpp files. 2011-10-08 02:53:03 -05:00
TighMacFanatic
85cbc8acda Fix broken create group popup (no text was showing when it was supposed to ask if you are sure). 2011-10-06 18:52:21 -04:00
TighMacFanatic
76eacbdc43 Added collapse all button to inventory window. 2011-10-06 12:55:30 -04:00
TighMacFanatic
4358e7d827 Fixed the debug textures floater not showing most of the textures. 2011-10-06 11:54:26 -04:00
Shyotl
0fd157fd16 Pants waist height paramater was driving "lower_jacket base bump" layer where it should have been driving the "lower_pants base bump" layer. Also adding some skipped cross_wearable settings, which will likeley be required soon-ish upon updating the wearable parameter manager. 2011-10-06 00:27:14 -05:00
TighMacFanatic
346629f6e0 Fix precompiled headers include order. 2011-10-06 01:12:24 -04:00
Siana Gearz
bb572efed4 Aua, Player! 2011-10-06 04:25:51 +02:00
Siana Gearz
619748ed1e Fix the map changes to use new blocks rather than adding fields and update the 'real' message template with the changes. 2011-10-06 03:56:06 +02:00
Siana Gearz
df7f37d0eb Add a bunch of fixes to the world and minimap so that teleports inside a var work and the map looks semi-correct. 
Conflicts:

	indra/newview/app_settings/message_template.msg
 2011-10-06 03:56:05 +02:00
TighMacFanatic
ed8fad3fd9 Merge branch 'future' of https://github.com/siana/SingularityViewer 2011-10-05 20:17:24 -04:00
RevolutionSmythe
00196ca439 Fix the minimap so that it has the right sized regions on the map tile. 2011-10-06 00:57:27 +02:00
Siana Gearz
5ef79d571b Add another patch for times where the user has no inventory items being worn and the viewer refusing to wearing new ones. 
Conflicts:

	indra/newview/llagentwearables.cpp
	indra/newview/llagentwearables.h
 2011-10-06 00:12:01 +02:00
Siana Gearz
e849458c1d Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-05 15:57:54 +02:00
Siana Gearz
6b4823429e Inventory mesh type. 
Conflicts:

	indra/llcommon/llassettype.cpp
	indra/llcommon/llassettype.h
 2011-10-05 15:54:57 +02:00
Shyotl
d58df6445c Disabling this tweak. Can look into fixing it later, but it's not a priority right now and it's not working completely right. 2011-10-04 21:51:38 -05:00
Siana Gearz
4a14b75452 Trivial fixes 2011-10-05 01:20:34 +02:00
Siana Gearz
6590172641 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-04 16:26:11 +02:00
Shyotl
ee9649bf2a Disabling this DEV-20105 'fix', as it draws orphaned prims, including attachments of all things. 2011-10-04 01:44:28 -05:00
Shyotl
07165f014f ERenderName enum had elements swap around. Doesn't match our saved settings (driven by preferences floater), so reverting and commenting. 2011-10-04 00:34:52 -05:00
Shyotl
6841b0cf47 RLVA fix. LLWearableType::typeNameToType now returns LLWearableType::WT_NONE, not LLWearableType::WT_INVALID 2011-10-03 23:30:07 -05:00
Siana Gearz
13e13ca862 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-04 06:17:54 +02:00
RevolutionSmythe
d7c2701773 Fix the grass.xml so that they don't have odd names that show up in the UI. 2011-10-04 06:08:32 +02:00
Siana Gearz
0a9c611dfd Merge back the ability to select the tree (not just random, from Imprudence). 
Conflicts:

	indra/newview/app_settings/settings.xml
	indra/newview/llfloatertools.cpp
 2011-10-04 06:07:52 +02:00
Siana Gearz
2cba3c45bd Crash fix, cache sanity 2011-10-04 06:02:19 +02:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
84a301c81a new throws an exception... checking if the return value is not null without either try/catching or using std::nothrow... would accomplish nothing. 2011-10-03 22:42:56 -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
Siana Gearz
9ac2c07f52 Merge https://github.com/PlayerDagostino/SingularityViewer into future 
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
 2011-10-03 16:10:35 +02:00
Shyotl
74dc875a27 Beginning to pull LLVOAvatarSelf out from LLVOAvatar. 2011-10-02 02:51:10 -05:00
TighMacFanatic
a1628abec3 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2011-09-27 12:56:04 -04:00
TighMacFanatic
3c758a06a3 Re-enabled Cancel TP button. 2011-09-27 12:37:02 -04:00
TighMacFanatic
344df747d5 Fixed text highlighting so terms found in names do not trigger. 2011-09-27 12:00:28 -04:00
Shyotl
21f39471f1 Allow muting of objects with no name through the chat display. 2011-09-25 18:19:27 -05:00
TighMacFanatic
00699801d2 Merge branch 'future' 2011-09-24 22:36:40 -04:00
TighMacFanatic
9b0723ec8d Merge branch 'future' of e:/SL_Dev/Shyotl into future 2011-09-24 21:24:58 -04:00
Shyotl
7f934f34f1 Minor renderer updates. 2011-09-23 00:55:24 -05:00