Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with Alchemy, includes much awaited lib updates for Linux

Browse Source 
Applies ALCH-420 - Replace all invisiprims with fully transparent texture and remove dead code paths
-ARC no longer takes invisis into consideration.

Syncs some script keywords updates.

Changes all "\n" in llfloaterabout.cpp to '\n' because screw.dat
This commit is contained in:
Lirusaito
2016-03-27 23:24:17 -04:00
parent af58abb7ec
commit e62261edb2
34 changed files with 1191 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/app_settings/keywords.ini
View File

@@ -182,6 +182,8 @@ PSYS_SRC_PATTERN_ANGLE_CONE
PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY
OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type
OBJECT_HOVER_HEIGHT This is a flag used with llGetObjectDetails to get hover height of the avatar. If no data is available, 0.0 is returned.
OBJECT_LAST_OWNER_ID Gets the object's last owner ID.
OBJECT_NAME Used with llGetObjectDetails to get an object's name
OBJECT_DESC Used with llGetObjectDetails to get an object's description
OBJECT_POS Used with llGetObjectDetails to get an object's position
@@ -189,6 +191,7 @@ OBJECT_ROT Used with llGetObjectDetails to get an o
OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity
OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned
OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key
OBJECT_CLICK_ACTION This is a flag used with llGetObjectDetails to get the click action. The default is 0.
OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key
OBJECT_RUNNING_SCRIPT_COUNT Gets the number of running scripts attached to the object or agent
OBJECT_TOTAL_SCRIPT_COUNT Gets the number of scripts, both running and stopped, attached to the object or agent.
@@ -199,6 +202,7 @@ OBJECT_SERVER_COST Used with llGetObjectDetails to get the
OBJECT_STREAMING_COST Used with llGetObjectDetails to get the streaming (download) cost.
OBJECT_PHYSICS_COST Used with llGetObjectDetails to get the physics cost.
OBJECT_PATHFINDING_TYPE Used with llGetObjectDetails to get an object's pathfinding settings.
OBJECT_BODY_SHAPE_TYPE This is a flag used with llGetObjectDetails to get the body type of the avatar, based on shape data. If no data is available, -1.0 is returned. This is normally between 0 and 1.0, with 0.5 and larger considered 'male'
OBJECT_CHARACTER_TIME Used with llGetObjectDetails to get an object's average CPU time (in seconds) used by the object for navigation, if the object is a pathfinding character. Returns 0 for non-characters.
OBJECT_ROOT Used with llGetObjectDetails to get an object's root prim ID.
OBJECT_ATTACHED_POINT Used with llGetObjectDetails to get an object's attachment point.
@@ -454,6 +458,7 @@ PRIM_SHINY_LOW Low shininess
PRIM_SHINY_MEDIUM Medium shininess
PRIM_SHINY_HIGH High shininess
PRIM_BUMP_NONE No bump map
PRIM_BUMP_BRIGHT Generate bump map from highlights
PRIM_BUMP_DARK Generate bump map from lowlights

12
indra/newview/app_settings/settings.xml
View File

@@ -86,18 +86,6 @@
<integer>0</integer>
</map>
<key>SianaRenderDeferredInvisiprim</key>
<map>
<key>Comment</key>
<string>Support invisiprims in deferred mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SianaVoidWaterSubdivision</key>
<map>
<key>Comment</key>