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 |
|
TighMacFanatic
|
346629f6e0
|
Fix precompiled headers include order.
|
2011-10-06 01:12:24 -04:00 |
|
TighMacFanatic
|
ed8fad3fd9
|
Merge branch 'future' of https://github.com/siana/SingularityViewer
|
2011-10-05 20:17:24 -04: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 |
|
Shyotl
|
c621cb7719
|
Curl had some structures moved to the header. Also had an extra mutex added for locking multihandle. Includes MISC #include order cleanup.
|
2011-09-22 23:59:44 -05:00 |
|
TighMacFanatic
|
c466b9a91a
|
Reverted code that allows users to steal UUID's of clothing textures.
|
2011-09-22 17:26:39 -04:00 |
|
Shyotl
|
381ef6fe70
|
GCC is just annoying sometimes.
|
2011-09-21 17:49:21 -05:00 |
|
Shyotl
|
2b69eb9902
|
Misc little tidbits from V3.
|
2011-09-20 22:16:00 -05:00 |
|
Shyotl
|
587a687ac6
|
LLThread updated.
|
2011-09-20 22:10:12 -05:00 |
|
Shyotl
|
cce1395876
|
LLInstanceTracker and LLSingleton updated yet again.
|
2011-09-20 22:09:45 -05:00 |
|
Shyotl
|
244e30297f
|
AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs.
|
2011-09-20 22:08:48 -05:00 |
|
Shyotl
|
d917bf6b06
|
LLAPRFile cleaned up
|
2011-09-20 21:39:27 -05:00 |
|
Shyotl
|
0ace809572
|
Fixed pre-login shutdown crash due to unitialized variables
|
2011-09-19 20:12:24 -05:00 |
|
Shyotl
|
a9b8712aa5
|
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into future
|
2011-09-19 16:22:20 -05:00 |
|
Siana Gearz
|
aed345b2ff
|
Don't mess up file perm on Linux
|
2011-09-19 03:26:53 +02:00 |
|
Siana Gearz
|
fb1b221378
|
Merge branch 'BatchIndexing' of https://github.com/Shyotl/SingularityViewer into future
|
2011-09-19 02:09:47 +02:00 |
|
Shyotl
|
7424bcee4b
|
Added super-temporary debug settings to help determine cause of textures baking as solid white for some users.
|
2011-09-12 15:44:44 -05:00 |
|
Shyotl
|
1fb1ba05ce
|
Optimization. Skip binding for rigged face types that have no faces to display.
|
2011-09-12 15:30:42 -05:00 |
|
Shyotl
|
3ba4861a3b
|
Avatar alpha masking now works with hardware skinning when not using fixed-function pipeline.
|
2011-09-10 15:45:28 -05:00 |
|
Shyotl
|
36600462d1
|
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
Conflicts:
indra/newview/hippopanelgrids.cpp
indra/newview/llstartup.cpp
indra/newview/llsurface.cpp
indra/newview/llviewermessage.cpp
indra/newview/llviewerparceloverlay.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/llworld.cpp
|
2011-09-09 16:53:12 -05:00 |
|
Shyotl
|
87bada69fa
|
GCC fixup
|
2011-09-09 14:42:59 -05:00 |
|
Shyotl
|
e5448533bf
|
lltexturecache tinkering.
|
2011-09-09 14:40:44 -05:00 |
|
Shyotl
|
3b435fe056
|
Skip checkClientArrays if not using fixed-function
|
2011-09-09 14:39:44 -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 |
|