Merge branch 'master' into ManagedMarketplace

# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h

indra/newview/skins/default/textures/textures.xml

@@ -39,7 +39,21 @@ with the same filename but different name
   <texture name="Accordion_Over" file_name="Accordion_Over.png" preload="false" />
   <texture name="Accordion_Selected" file_name="Accordion_Selected.png" preload="false" />
 
+  <texture name="Cam_Preset_Back_Off" file_name="Cam_Preset_Back_Off.png" preload="false" />
+  <texture name="Cam_Preset_Back_On" file_name="Cam_Preset_Back_On.png" preload="false" />
+  <texture name="Cam_Preset_Front_Off" file_name="Cam_Preset_Front_Off.png" preload="false" />
+  <texture name="Cam_Preset_Front_On" file_name="Cam_Preset_Front_On.png" preload="false" />
+  <texture name="Cam_Preset_Side_Off" file_name="Cam_Preset_Side_Off.png" preload="false" />
+  <texture name="Cam_Preset_Side_On" file_name="Cam_Preset_Side_On.png" preload="false" />
+
   <texture name="icon_group.tga"/>
+
+  <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
+  <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
+  <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
+  <texture name="Favorite_Star_Over" file_name="navbar/Favorite_Star_Over.png" preload="false" />
+  <texture name="Favorite_Link_Over" file_name="navbar/Favorite_Link_Over.png" preload="false" />
+
   <texture name="Parcel_M_Dark" file_name="map_event_mature.tga" preload="true" />
   <texture name="Parcel_M_Light" file_name="map_event_mature.tga" preload="false" />
   <texture name="Parcel_PG_Light" file_name="map_event.tga" preload="false" />
@@ -119,21 +133,27 @@ with the same filename but different name
   <texture name="default_profile_picture.j2c"/>
   <texture name="locked_image.j2c"/>
 
-  <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
-  <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />
-  <texture name="Progress_3" file_name="icons/Progress_3.png" preload="true" />
-  <texture name="Progress_4" file_name="icons/Progress_4.png" preload="true" />
-  <texture name="Progress_5" file_name="icons/Progress_5.png" preload="true" />
-  <texture name="Progress_6" file_name="icons/Progress_6.png" preload="true" />
-  <texture name="Progress_7" file_name="icons/Progress_7.png" preload="true" />
-  <texture name="Progress_8" file_name="icons/Progress_8.png" preload="true" />
-  <texture name="Progress_9" file_name="icons/Progress_9.png" preload="true" />
-  <texture name="Progress_10" file_name="icons/Progress_10.png" preload="true" />
-  <texture name="Progress_11" file_name="icons/Progress_11.png" preload="true" />
-  <texture name="Progress_12" file_name="icons/Progress_12.png" preload="true" />
+  <texture name="Progress_1" file_name="Progress_1.png" preload="true" />
+  <texture name="Progress_2" file_name="Progress_2.png" preload="true" />
+  <texture name="Progress_3" file_name="Progress_3.png" preload="true" />
+  <texture name="Progress_4" file_name="Progress_4.png" preload="true" />
+  <texture name="Progress_5" file_name="Progress_5.png" preload="true" />
+  <texture name="Progress_6" file_name="Progress_6.png" preload="true" />
+  <texture name="Progress_7" file_name="Progress_7.png" preload="true" />
+  <texture name="Progress_8" file_name="Progress_8.png" preload="true" />
+  <texture name="Progress_9" file_name="Progress_9.png" preload="true" />
+  <texture name="Progress_10" file_name="Progress_10.png" preload="true" />
+  <texture name="Progress_11" file_name="Progress_11.png" preload="true" />
+  <texture name="Progress_12" file_name="Progress_12.png" preload="true" />
 
   <!-- Images that have since been renamed to something else in v3 and need updating. Alphabetical. -->
   <texture name="Flag.png" file_name="Flag.png" preload="false" />
+  <texture name="Inv_Post_Process.png" preload="true"/>
+  <texture name="Inv_Settings" file_name="Inv_Settings.png" preload="false" />
+  <texture name="Inv_SettingsSky" file_name="Inv_SettingsSky.png" preload="false" />
+  <texture name="Inv_SettingsWater" file_name="Inv_SettingsWater.png" preload="false" />
+  <texture name="Inv_SettingsDay" file_name="Inv_SettingsDay.png" preload="false" />
+  <texture name="Inv_Unknown" file_name="Inv_UnknownObject.png" preload="false" />
   <texture name="Inv_WaterLight.png" preload="true"/>
   <texture name="Inv_WindLight.png" preload="true"/>
   <texture name="Parcel_Exp_Color.png" file_name="Parcel_Exp_Color.png" preload="false" />

indra/newview/skins/default/xui/de/strings.xml

@@ -1291,8 +1291,8 @@ Sets the given permission mask to the new value on the root object the task is a
     Please keep LL-LSL above this section
     ** DATA SOURCES **
        OpenSim OS Functions:      \OpenSim\Region\ScriptEngine\Shared\Api\Interface\IOSSL_Api.cs
-       Aurora-Sim AA Functions:   \Aurora\AuroraDotNetEngine\APIs\AA_API.cs
-       Aurora-Sim BOT Functions:  \Aurora\BotManager\Bot_API.cs
+       WhiteCore AA Functions:    \WhiteCore\ScriptEngine\DotNetEngine\APIs\AA\AA_API.cs
+       WhiteCore BOT Functions:   \WhiteCore\BotManager\Bot_API.cs
 -->
 
 	<string name="LSLTipText_osSetDynamicTextureURL">osSetDynamicTextureURL(key dynamicID, string contentType, string url, string extraParams, integer timer )
@@ -1622,199 +1622,139 @@ Set the current WindLight scene directed at a specific avatar. Estate managers a
 	<string name="LSLTipText_lsGetWindlightScene">list lsGetWindlightScene(list rules)
 Get the current WindLight settings.
 (Reguires LightShare Enabled Viewer)</string>
-<!-- Aurora-Sim OSSL-Functions  (unique to Aurora Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
-   Aurora-Sim aaFunctions (\Aurora\AuroraDotNetEngine\APIs\IAA_Api.cs)
-   Aurora-Sim botFunctions (\Aurora\BotManager\IBot_Api.cs) 
+<!-- WhiteCore OSSL-Functions  (unique to WhiteCore Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
+   WhiteCore aaFunctions (\WhiteCore\ScriptEngine\DotNetEngine\APIs\AA\AA_Api.cs)
+   WhiteCore botFunctions (\WhiteCore\BotManager\Bot_Api.cs)
 -->
 	<string name="LSLTipText_osReturnObject">osReturnObject(key userID)
-Returns object to specified avatars UUID.
-(Aurora-Sim only)</string>
+Returns object to specified avatars UUID.</string>
 	<string name="LSLTipText_osReturnObjects">osReturnObjects(float Parameter)
-Returns group of objects. Parameter's are numeric, values are owner objects = 0, everyone except owner objects = 1, group objects = 2.
-(Aurora-Sim only)</string>
+Returns group of objects. Parameter's are numeric, values are owner objects = 0, everyone except owner objects = 1, group objects = 2.</string>
 	<string name="LSLTipText_osShutDown">osShutDown()
-Shut's down current Simulator.  Authorized Admin Only by config.
-(Aurora-Sim only)</string>
+Shut's down current Simulator.  Authorized Admin Only by config.</string>
 	<string name="LSLTipText_osAddAgentToGroup">osAddAgentToGroup(key avatarID, string group_name, string role_name)
-Adds an avatar to a group.  Where group_name = name of the target group, role_name = role to assign within the group.
-(Aurora-Sim only)</string>
+Adds an avatar to a group.  Where group_name = name of the target group, role_name = role to assign within the group.</string>
 	<string name="LSLTipText_osRezObject">osRezObject(string inventory, vector position, vector velocity, rotation rot, integer param, integer isRezAtRoot, integer doRecoil, integer SetDieAtEdge, integer CheckPos)
 Where inventory = object to rez.  Position = vector to rez object.  Velocity = initial velocity.  Rot = initial rotation.  Param = onrez event.
 IzAtRoot = TRUE/FALSE flag changes llRezAtRoot to llRezObject.  doRecoil =TRUE/FALSE to push avatar.  SetDieAtEdge = TRUE/FALSE for rezzed object to die at edge of region.
-CheckPos = TRUE/FALSE enable/disable 10m rez limit.
-(Aurora-Sim only)</string>
+CheckPos = TRUE/FALSE enable/disable 10m rez limit.</string>
 	<string name="LSLTipText_aaSetCloudDensity">aaSetCloudDensity(float density)
-AaSetCloudDensity(0.5)  Where float density values are 0.0 =  no cloud to 1.0 = 100% cloud.
-(Aurora-Sim only)</string>
+AaSetCloudDensity(0.5)  Where float density values are 0.0 =  no cloud to 1.0 = 100% cloud.</string>
 	<string name="LSLTipText_aaUpdateDatabase">aUpdateDatabase(string Key, string value, string token)
-Where Key = database field name, xmlDataToPutIntoTheDatabase = serialized XML data,  Token = data-password
-(Aurora-Sim only)</string>
+Where Key = database field name, xmlDataToPutIntoTheDatabase = serialized XML data,  Token = data-password</string>
 	<string name="LSLTipText_aaQueryDatabase">aaQueryDatabase(string Key, string Token)
 Returns a list with first value is the token, the second the Key, and the third the value
-Where Key = database field name, Token = data-password
-(Aurora-Sim only)</string>
+Where Key = database field name, Token = data-password</string>
 	<string name="LSLTipText_aaDeserializeXMLValues">aaDeserializeXMLValues(string xmlData)
-Returns a list of Values from XML data. Where xmlData = xml formatted data Values.
-(Aurora-Sim only)</string>
+Returns a list of Values from XML data. Where xmlData = xml formatted data Values.</string>
 	<string name="LSLTipText_aaDeserializeXMLKeys">aaDeserializeXMLKeys(string xmlData)
-Returns a list of keys from XML data. Where xmlData = xml formatted data keys.
-(Aurora-Sim only)</string>
+Returns a list of keys from XML data. Where xmlData = xml formatted data keys.</string>
 	<string name="LSLTipText_aaSetConeOfSilence">aaSetConeOfSilence(float radius)
-Where radius = metres radius from centre of scripted item.  This creates an area that sounds can only be heard by the people within the area(radius) and not heard outside and visa-versa.
-(Aurora-Sim only)</string>
+Where radius = metres radius from centre of scripted item.  This creates an area that sounds can only be heard by the people within the area(radius) and not heard outside and visa-versa.</string>
 	<string name="LSLTipText_aaSerializeXML">aaSerializeXML(list keys, list values)
-Returns xml formatted string of the keys and values.  Where keys = list of keys in the database, values = fields to retrieve from database.
-(Aurora-Sim only)</string>
+Returns xml formatted string of the keys and values.  Where keys = list of keys in the database, values = fields to retrieve from database.</string>
 	<string name="LSLTipText_aaGetTeam">aaGetTeam(key uuid)
-Returns a string of avatars team name.  Where uuid = avatar key.
-(Aurora-Sim only)</string>
+Returns a string of avatars team name.  Where uuid = avatar key.</string>
 	<string name="LSLTipText_aaGetHealth">aaGetHealth(key uuid)
-Returns float value (0.0 to 100.0) of current health.  Where uuid = avatar key.
-(Aurora-Sim only)</string>
+Returns float value (0.0 to 100.0) of current health.  Where uuid = avatar key.</string>
 	<string name="LSLTipText_aaJoinCombat">aaJoinCombat(key uuid)
-Where uuid = avatar key.  If (PERMISSION_COMBAT == PERMISSION_COMBAT) and permission is granted then join combat.
-(Aurora-Sim only)</string>
+Where uuid = avatar key.  If (PERMISSION_COMBAT == PERMISSION_COMBAT) and permission is granted then join combat.</string>
 	<string name="LSLTipText_aaLeaveCombat">aaLeaveCombat(key uuid)
-Where uuid = avatar key.
-(Aurora-Sim only)</string>
+Where uuid = avatar key.</string>
 	<string name="LSLTipText_aaJoinCombatTeam">aaJoinCombatTeam(key uuid, string team)
-Where uuid = key of avatar, team = string of the team name.
-(Aurora-Sim only)</string>
+Where uuid = key of avatar, team = string of the team name.</string>
 	<string name="LSLTipText_aaRequestCombatPermission">aaRequestCombatPermission(key ID)
 Where ID = avatar uuid.  Requests target avatar for Permissions to enter into combat mode.
-Raises a run_time_permissions event. (PERMISSION_COMBAT == PERMISSION_COMBAT).
-(Aurora-Sim only)</string>
+Raises a run_time_permissions event. (PERMISSION_COMBAT == PERMISSION_COMBAT).</string>
 	<string name="LSLTipText_aaThawAvatar">aaThawAvatar(key ID)
-Where ID = avatar uuid. If combat permission are granted then avatar can be un-frozen (movement re-enabled).
-(Aurora-Sim only)</string>
+Where ID = avatar uuid. If combat permission are granted then avatar can be un-frozen (movement re-enabled).</string>
 	<string name="LSLTipText_aaFreezeAvatar">aaFreezeAvatar(key ID)
-Where ID = avatar uuid. If combat permission are granted then avatar can be frozen (no movement).
-(Aurora-Sim only)</string>
+Where ID = avatar uuid. If combat permission are granted then avatar can be frozen (no movement).</string>
 	<string name="LSLTipText_aaGetTeamMembers">aaGetTeamMembers(string team)
-Return a list of team members.  Where team = string of team name.
-(Aurora-Sim only)</string>
+Return a list of team members.  Where team = string of team name.</string>
 	<string name="LSLTipText_aaGetLastOwner">POLYMORPHIC FUNCTION.
 aaGetLastOwner(string PrimID)  returns last owner UUID of PrimID where PrimID = uuid of prim.
-AaGetLastOwner()  returns last owner uuid of prim containg script.
-(Aurora-Sim only)</string>
+AaGetLastOwner()  returns last owner uuid of prim containg script.</string>
 	<string name="LSLTipText_aaSayDistance">aaSayDistance(integer channelID, float Distance, string text)
-Where channelID = channel to say on, Distance = float in meters  for distance to say, text = string to say.
-(Aurora-Sim only)</string>
+Where channelID = channel to say on, Distance = float in meters  for distance to say, text = string to say.</string>
 	<string name="LSLTipText_aaSayTo">aaSayTo(key userID, string text)
-Where userID = avatar key, text = string msg.  Similar to llOwnerSay but can be directly targeted to an avatar.
-(Aurora-Sim only)</string>
+Where userID = avatar key, text = string msg.  Similar to llOwnerSay but can be directly targeted to an avatar.</string>
 	<string name="LSLTipText_aaGetWalkDisabled">aaGetWalkDisabled(key ID)
-Returns integer of TRUE or FALSE for specifid ID.  Where ID = avatar uuid.
-(Aurora-Sim only)</string>
+Returns integer of TRUE or FALSE for specifid ID.  Where ID = avatar uuid.</string>
 	<string name="LSLTipText_aaSetWalkDisabled">aaSetWalkDisabled(key ID, integer Value)
-Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.
-(Aurora-Sim only)</string>
+Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.</string>
 	<string name="LSLTipText_aaGetFlyDisabled">aaGetFlyDisabled(key ID)
-Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
-(Aurora-Sim only)</string>
+Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.</string>
 	<string name="LSLTipText_aaSetFlyDisabled">aaSetFlyDisabled(key ID, integer Value)
-Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.
-(Aurora-Sim only)</string>
+Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.</string>
 	<string name="LSLTipText_aaAvatarFullName2Key">aaAvatarFullName2Key(string FullName)
-Returns the avatar uuid from their fullname.  Where FullName = "Firstname Lastname”.
-(Aurora-Sim only)</string>
+Returns the avatar uuid from their fullname.  Where FullName = "Firstname Lastname”.</string>
 	<string name="LSLTipText_aaRaiseError">aaRaiseError(string message)
-Allows you to have errors that end the execution of the event and fire another event in the script.
-(Aurora-Sim only)</string>
+Allows you to have errors that end the execution of the event and fire another event in the script.</string>
 	<string name="LSLTipText_aaGetText">aaGetText()
-Returns a string of the hover text of an object.
-(Aurora-Sim only)</string>
+Returns a string of the hover text of an object.</string>
 	<string name="LSLTipText_aaGetTextColor">aaGetTextColor()
-Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s  Where s = value of alpha in llSetText.
-(Aurora-Sim only)</string>
+Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s  Where s = value of alpha in llSetText.</string>
 	<string name="LSLTipText_aaSetEnv">aaSetEnv(string EnvName, list Value)
 Sets environment values.  Where EnvName = ENABLE_GRAVITY, GRAVITY_FORCE_X, GRAVITY_FORCE_Y, GRAVITY_FORCE_Z, ADD_GRAVITY_POINT, ADD_GRAVITY_FORCE, START_TIME_REVERSAL_SAVING,
-STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.
-(Aurora-Sim only)</string>
+STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.</string>
 	<string name="LSLTipText_aaGetIsInfiniteRegion">aaGetIsInfiniteRegion()
-Returns TRUE or FALSE if region is an infinite region.
-(Aurora-Sim only)</string>
+Returns TRUE or FALSE if region is an infinite region.</string>
 	<string name="LSLTipText_aaSetCharacterStat">aaSetCharacterStat( ID, StatName, statValue)
-Sets Character Stats.  Where ID = avatar uuid, StatName = stat to change, statValue the value to change it to.
-(Aurora-Sim only)</string>
-	<string name="LSLTipText_aaAllRegionInstanceSay">aaAllRegionInstanceSay(integer channelID, string text)
-(Aurora-Sim only)</string>
+Sets Character Stats.  Where ID = avatar uuid, StatName = stat to change, statValue the value to change it to.</string>
+	<string name="LSLTipText_aaAllRegionInstanceSay">aaAllRegionInstanceSay(integer channelID, string text)</string>
 	<string name="LSLTipText_aaWindlightGetDayCycle">aaWindlightGetDayCycle()
-Returns a List of settings
-(Aurora-Sim only)</string>
+Returns a List of settings</string>
 	<string name="LSLTipText_aaWindlightAddDayCycleFrame">aaWindlightAddDayCycleFrame(float dayCyclePosition, integer dayCycleFrameToCopy)
-Returns TRUE / FALSE on success status
-(Aurora-Sim only)</string>
+Returns TRUE / FALSE on success status</string>
 	<string name="LSLTipText_aaWindlightRemoveDayCycleFrame">aaWindlightRemoveDayCycleFrame(int dayCycleFrame)
-Returns TRUE / FALSE on success status
-(Aurora-Sim only)</string>
+Returns TRUE / FALSE on success status</string>
 	<string name="LSLTipText_aaWindlightSetScene">aaWindlightSetScene(list list)
 aaWindlightSetScene(integer dayCycleIndex, list list)
-Returns TRUE/FALSE on success
-(Aurora-Sim only)</string>
+Returns TRUE/FALSE on success</string>
 	<string name="LSLTipText_aaWindlightGetScene">aaWindlightGetScene(list rules)
 aaWindlightGetScene(integer dayCycleKeyFrame, list rules)
-Returns a list
-(Aurora-Sim only)</string>
+Returns a list</string>
 	<string name="LSLTipText_aaWindlightGetSceneIsStatic">aaWindlightGetSceneIsStatic()
-Returns TRUE / FALSE
-(Aurora-Sim only)</string>
+Returns TRUE / FALSE</string>
 	<string name="LSLTipText_aaWindlightGetSceneDayCycleKeyFrameCount">aaWindlightGetSceneDayCycleKeyFrameCount()
-Returns integer value
-(Aurora-Sim only)</string>
+Returns integer value</string>
 	<string name="LSLTipText_botGetWaitingTime">botGetWaitingTime(integer waitTime)
-Returns waitTime as vector.
-(Aurora-Sim only)</string>
+Returns waitTime as vector.</string>
 	<string name="LSLTipText_botSetMap">botSetMap(key keyOfBot, list positions, list movementType, integer flags)
 keyOfBot = bot uuid, positions = list of position vectors, movementType = corresponding list of move modes:  0 – walk, 1 – fly,
-flags = BOT_FOLLOW_FLAG_NONE and BOT_FOLLOW_FLAG_INDEFINITELY.
-(Aurora-Sim only)</string>
+flags = BOT_FOLLOW_FLAG_NONE and BOT_FOLLOW_FLAG_INDEFINITELY.</string>
 	<string name="LSLTipText_botCreateBot">botCreateBot(string FirstName, string LastName, key idToClone, vector startPos)
-Where FirstName and LastName = strings for new bot name.  idToClone = uuid of prebuild avatar to clone OR another existing avatar.  startPos = vector of starting position on region.
-(Aurora-Sim only)</string>
+Where FirstName and LastName = strings for new bot name.  idToClone = uuid of prebuild avatar to clone OR another existing avatar.  startPos = vector of starting position on region.</string>
 	<string name="LSLTipText_botRemoveBot">botRemoveBot(key botID)
-Where botID = uuid of bot.  Removes bot identified by botID.
-(Aurora-Sim only)</string>
+Where botID = uuid of bot.  Removes bot identified by botID.</string>
 	<string name="LSLTipText_botPauseMovement">botPauseMovement(key botID)
-Where botID = bot uuid.  Pauses bot at current position.
-(Aurora-Sim only)</string>
+Where botID = bot uuid.  Pauses bot at current position.</string>
 	<string name="LSLTipText_botResumeMovement">botResumeMovement(key botID)
-Where botID = bot uuid.  Resumes bot movement.
-(Aurora-Sim only)</string>
+Where botID = bot uuid.  Resumes bot movement.</string>
 	<string name="LSLTipText_botFollowAvatar">botFollowAvatar(key botID, string avName, float startFollowDistance, float endFollowDistance)
-Where botID = bot uuid.  AvName = sting of avatar name OR avatar uuid.  StartFollowDistance = distance to start following from.  EndFollowDistance = distance to stop following avatar.
-(Aurora-Sim only)</string>
+Where botID = bot uuid.  AvName = sting of avatar name OR avatar uuid.  StartFollowDistance = distance to start following from.  EndFollowDistance = distance to stop following avatar.</string>
 	<string name="LSLTipText_botStopFollowAvatar">botStopFollowAvatar(key botID)
-Where botID = bot uuid.  Stops bot from following an avatar.
-(Aurora-Sim only)</string>
+Where botID = bot uuid.  Stops bot from following an avatar.</string>
 	<string name="LSLTipText_botSendChatMessage">botSendChatMessage(key botID, string message, integer channel, integer sayType)
-Where  botID = bot uuid.  Message = string msg.  Channel = channel to speak on.  SayType = (0=whisper, 1=say, 2=shout).
-(Aurora-Sim only)</string>
+Where  botID = bot uuid.  Message = string msg.  Channel = channel to speak on.  SayType = (0=whisper, 1=say, 2=shout).</string>
 	<string name="LSLTipText_botSendIM">botSendIM(string bot, string user, string message)
-Send IM to bot.
-(Aurora-Sim only)</string>
+Send IM to bot.</string>
 	<string name="LSLTipText_botSetShouldFly">botSetShouldFly(key botID, integer ShouldFly)
-Where botID = bot uuid.  ShouldFly = TRUE/FALSE.  Enables or disables flight mode.
-(Aurora-Sim only)</string>
+Where botID = bot uuid.  ShouldFly = TRUE/FALSE.  Enables or disables flight mode.</string>
 	<string name="LSLTipText_botSitObject">botSitObject(key botID, key objectID, vector offset)
-Where botID = bot uuid,  objectID = uuid of object to sit on,  offset = Vector for sit position (note that VECTOR_ZERO = default sit pos).
-(Aurora-Sim only)</string>
+Where botID = bot uuid,  objectID = uuid of object to sit on,  offset = Vector for sit position (note that VECTOR_ZERO = default sit pos).</string>
 	<string name="LSLTipText_botStandUp">botStandUp(key botID)
-Where botID = bot uuid.  Command bot to stand up.
-(Aurora-Sim only)</string>
+Where botID = bot uuid.  Command bot to stand up.</string>
 	<string name="LSLTipText_botTouchObject">botTouchObject(key botID, key objectID)
-Where botID = bot uuid,  objectID = object uuid.  Causes bot to touch object identified.
-(Aurora-Sim only)</string>
+Where botID = bot uuid,  objectID = object uuid.  Causes bot to touch object identified.</string>
 	<string name="LSLTipText_botAddTag">botAddTag(key botID, string tag)
-Where botID = bot uuid,  tag = string tag over bot.
-(Aurora-Sim only)</string>
+Where botID = bot uuid,  tag = string tag over bot.</string>
 	<string name="LSLTipText_botGetBotsWithTag">botGetBotsWithTag(string tag)
-Where tag = tag string to match.  Return a list of bot UUID's in region with the matching tag.
-(Aurora-Sim only)</string>
+Where tag = tag string to match.  Return a list of bot UUID's in region with the matching tag.</string>
 	<string name="LSLTipText_botRemoveBotsWithTag">botRemoveBotsWithTag(string tag)
-Where tag = tag string to match.  Removes bot's matching the tag.
-(Aurora-Sim only)</string>
-<!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
+Where tag = tag string to match.  Removes bot's matching the tag.</string>
+<!-- *** END OF OpenSimulator & WhiteCore syntax section *** -->
 
 	<!-- Strings needed by drop targets -->
 	<string name="CurrentlyNotSet">Currently not set</string>

indra/newview/skins/default/xui/en-us/floater_autoreplace.xml

@@ -202,7 +202,7 @@
    height="23"
    layout="topleft"
    left="100"
-   max_length_bytes="255"
+   max_length="2147483647"
    bottom_delta="0"
    width="150"
    />
@@ -224,7 +224,7 @@
    height="23"
    layout="topleft"
    left="100"
-   max_length_bytes="255"
+   max_length="2147483647"
    bottom_delta="0"
    width="280"
    />

indra/newview/skins/default/xui/en-us/floater_customize.xml

@@ -412,6 +412,9 @@ scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -494,6 +497,9 @@ scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -627,6 +633,9 @@ scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -709,6 +718,9 @@ scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -795,6 +807,9 @@ scratch and wear it.
       <button bottom="-330" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -877,6 +892,9 @@ scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -961,6 +979,9 @@ one from scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -1045,6 +1066,9 @@ one from scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -1127,6 +1151,9 @@ scratch and wear it.
       <button bottom="-250" follows="left|top" font="SansSerif" halign="center"
 			     height="20" label="Take Off" label_selected="Take Off" left="8"
 			     mouse_opaque="true" name="Take Off" scale_image="true" width="82" />
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
       <button bottom="-478" follows="right|bottom" font="SansSerif" halign="center"
 			     height="20" label="Save" label_selected="Save" left="123"
 			     mouse_opaque="true" name="Save" scale_image="true" width="82" />
@@ -1213,6 +1240,9 @@ scratch and wear it.
 			     mouse_opaque="true" scale_image="true"/>
             <button name="Take Off" label="Take Off" label_selected="Take Off"
              follows="left|top" width="82" height="20" left="8" bottom="-440"/>
+            <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+            <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+            <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
             <button name="Save" label="Save" label_selected="Save"
              follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
             <button name="Save As" label="Save As..." label_selected="Save As..."
@@ -1288,11 +1318,11 @@ one from scratch and wear it.
              can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
              follows="left|top" width="64" height="80" left_delta="90" bottom="-165"/>
             <check_box name="head alpha texture invisible"
-             follows="left" width="16" height="16" left="142" bottom="-90"/>
+             follows="left|top" width="16" height="16" left="142" bottom="-90"/>
             <check_box name="upper alpha texture invisible"
-             follows="left" width="16" height="16" left_delta="90" bottom="-90"/>
+             follows="left|top" width="16" height="16" left_delta="90" bottom="-90"/>
             <check_box name="lower alpha texture invisible"
-             follows="left" width="16" height="16" left_delta="90" bottom="-90"/>
+             follows="left|top" width="16" height="16" left_delta="90" bottom="-90"/>
             <texture_picker name="Hair Alpha" label="Hair Alpha" tool_tip="Click to choose a picture"
              can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
              follows="left|top" width="64" height="80" left="120" bottom="-280"/>
@@ -1300,14 +1330,17 @@ one from scratch and wear it.
              can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
              follows="left|top" width="64" height="80" left_delta="90" bottom="-280"/>
             <check_box name="hair alpha texture invisible"
-             follows="left" width="16" height="16" left="142" bottom="-205"/>
+             follows="left|top" width="16" height="16" left="142" bottom="-205"/>
             <check_box name="eye alpha texture invisible"
-             follows="left" width="16" height="16" left_delta="90" bottom="-205"/>
+             follows="left|top" width="16" height="16" left_delta="90" bottom="-205"/>
 			<button name="Create New" label="Create New Alpha" label_selected="Create New Alpha"
                  follows="left|top" halign="center" width="170" height="24" left="160" bottom="-148"
 			     mouse_opaque="true" scale_image="true"/>
             <button name="Take Off" label="Take Off" label_selected="Take Off"
-             follows="left|top" width="82" height="20" left="123" bottom="-340"/>
+             follows="left|top" width="82" height="20" left="117" bottom="-320"/>
+            <button bottom_delta="0" left_delta="86" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+            <button bottom_delta="0" left_delta="86" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+            <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
             <button name="Save" label="Save" label_selected="Save"
              follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
             <button name="Save As" label="Save As..." label_selected="Save As..."
@@ -1345,7 +1378,10 @@ one from scratch and wear it.
 			     mouse_opaque="true" name="Advanced Parameters" scale_image="true" width="82" />
       <button name="Take Off" label="Take Off" label_selected="Take Off"
            follows="left|top" width="82" height="20" left="8" bottom="-375"/>
-      
+      <button bottom_delta="-26" follows="left|top" height="20" width="82" name="New Layer" label="New Layer"/>
+      <button bottom_delta="-26" follows="left|top" height="20" width="41" name="Arrow Left" label="◀️◀️" tool_tip="Move to inner layer."/>
+      <button bottom_delta="0" left_delta="41" height="20" follows="left|top" width="41" name="Arrow Right" label="▶️▶️" tool_tip="Move to outer layer."/>
+
       <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-24" drop_shadow_visible="true" follows="left|top|right"
 			     font="SansSerif" h_pad="0" halign="left" height="16" left="26"

indra/newview/skins/default/xui/en-us/floater_top_objects.xml

@@ -296,4 +296,15 @@
       <button.commit_callback
           function="TopObjects.Kick" />
     </button>
+    <button
+     follows="bottom|left"
+     height="20"
+     label="Focus on"
+     left_delta="110"
+     name="focus_on_btn"
+     bottom_delta="0"
+     width="110">
+      <button.commit_callback
+          function="TopObjects.CamToObject" />
+    </button>
 </floater>

indra/newview/skins/default/xui/en-us/fonts.xml

@@ -8,6 +8,7 @@
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
       <file>ArialUni.ttf</file>
+      <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
       <file>ヒラギノ角ゴ ProN W3.otf</file>

indra/newview/skins/default/xui/en-us/menu_url_agent.xml

@@ -41,12 +41,15 @@
          function="Text.Url" userdata="CopyLabel" />
     </menu_item_call>
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click
          function="Text.Url" userdata="CopyUrl" />
     </menu_item_call>
+  <menu_item_call label="Copy Key to clipboard" name="key_copy">
+    <menu_item_call.on_click function="Text.Url.CopyUUID" />
+  </menu_item_call>
   <menu_item_call label="Select All" name="Select All">
     <on_click function="Text" userdata="SelectAll"/>
   </menu_item_call>

indra/newview/skins/default/xui/en-us/menu_url_agent_mini.xml

@@ -20,12 +20,15 @@
       function="Text.Url" userdata="CopyLabel" />
   </menu_item_call>
   <menu_item_call
-    label="Copy SLurl to clipboard"
+    label="Copy SLURL to clipboard"
     layout="topleft"
     name="url_copy">
     <menu_item_call.on_click
       function="Text.Url" userdata="CopyUrl" />
   </menu_item_call>
+  <menu_item_call label="Copy Key to clipboard" name="key_copy">
+    <menu_item_call.on_click function="Text.Url.CopyUUID" />
+  </menu_item_call>
   <menu_item_call label="Select All" name="Select All">
     <on_click function="Text" userdata="SelectAll"/>
   </menu_item_call>

indra/newview/skins/default/xui/en-us/menu_url_experience.xml

@@ -4,12 +4,15 @@
  label="URL"
  name="Url Popup">
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click
          function="Text.Url" userdata="CopyUrl" />
     </menu_item_call>
+  <menu_item_call label="Copy Key to clipboard" name="key_copy">
+    <menu_item_call.on_click function="Text.Url.CopyUUID" />
+  </menu_item_call>
   <menu_item_call label="Select All" name="Select All">
     <on_click function="Text" userdata="SelectAll"/>
   </menu_item_call>

indra/newview/skins/default/xui/en-us/menu_url_group.xml

@@ -20,12 +20,15 @@
          function="Text.Url" userdata="CopyLabel" />
     </menu_item_call>
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click
          function="Text.Url" userdata="CopyUrl" />
     </menu_item_call>
+  <menu_item_call label="Copy Key to clipboard" name="key_copy">
+    <menu_item_call.on_click function="Text.Url.CopyUUID" />
+  </menu_item_call>
   <menu_item_call label="Select All" name="Select All">
     <on_click function="Text" userdata="SelectAll"/>
   </menu_item_call>

indra/newview/skins/default/xui/en-us/menu_url_inventory.xml

@@ -20,7 +20,7 @@
          function="Text.Url" userdata="CopyLabel" />
     </menu_item_call>
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click

indra/newview/skins/default/xui/en-us/menu_url_map.xml

@@ -22,7 +22,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click

indra/newview/skins/default/xui/en-us/menu_url_objectim.xml

@@ -50,12 +50,15 @@
          function="Text.Url" userdata="CopyLabel" />
     </menu_item_call>
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click
          function="Text.Url" userdata="CopyUrl" />
     </menu_item_call>
+  <menu_item_call label="Copy Key to clipboard" name="key_copy">
+    <menu_item_call.on_click function="Text.Url.CopyUUID" userdata="object"/>
+  </menu_item_call>
   <menu_item_call label="Select All" name="Select All">
     <on_click function="Text" userdata="SelectAll"/>
   </menu_item_call>

indra/newview/skins/default/xui/en-us/menu_url_parcel.xml

@@ -22,7 +22,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click

indra/newview/skins/default/xui/en-us/menu_url_slapp.xml

@@ -13,7 +13,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click

indra/newview/skins/default/xui/en-us/menu_url_slurl.xml

@@ -29,7 +29,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click

indra/newview/skins/default/xui/en-us/menu_url_teleport.xml

@@ -22,7 +22,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Copy SLurl to clipboard"
+     label="Copy SLURL to clipboard"
      layout="topleft"
      name="url_copy">
         <menu_item_call.on_click

indra/newview/skins/default/xui/en-us/menu_viewer.xml

@@ -1050,6 +1050,10 @@
 				<on_click function="PromptShowURL" name="RequestFeature_url" userdata="WebLaunchSinguIssue,https://singularityviewer.atlassian.net/secure/CreateIssue!default.jspa?issuetype=2"/>
 			</menu_item_call>
 		</menu>
+		<menu_item_call label="[SHORT_APP_NAME] Group" name="viewer group">
+			<on_click function="URLAction" userdata="secondlife:///app/group/4fa278be-b621-9447-0958-85af4b01cdab/about"/>
+			<on_visible function="VisibleSecondLife"/>
+		</menu_item_call>
 		<menu_item_call bottom="-313" enabled="true" height="19" label="About [SHORT_APP_NAME]..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -11382,7 +11382,7 @@ for information and download links for this new version.
    type="notify">
 Your version of Singularity[TYPE] is critically out of date!
 
-It is STRONGLY recommended to download a newer version of this viewer due to grid compatability and/or security concerns.
+It is STRONGLY recommended to download a newer version of this viewer due to grid compatibility and/or security concerns.
 
 Click [Visit Page] to open
 [URL]
@@ -11403,7 +11403,7 @@ for information and download links for newer versions.
    type="alertmodal">
 Your version of Singularity[TYPE] is critically out of date!
 
-It is STRONGLY recommended to download a newer version of this viewer due to grid compatability and/or security concerns.
+It is STRONGLY recommended to download a newer version of this viewer due to grid compatibility and/or security concerns.
 
 Click [Visit Page] to open
 [URL]

indra/newview/skins/default/xui/en-us/panel_login.xml

@@ -35,7 +35,7 @@
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20"
            follows="left|bottom" font="SansSerifSmall" handle_edit_keys_directly="true"
-           height="20" left="4" max_length="16" mouse_opaque="true"
+           height="20" left="4" max_length="24" mouse_opaque="true"
            name="password_edit" select_all_on_focus_received="true" width="115" />
     </layout_panel>
     <layout_panel name="grids_panel" left="0" user_resize="false" auto_resize="false" width="143" min_width="0" visibility_control="ForceShowGrid">

indra/newview/skins/default/xui/en-us/panel_overlaybar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
+<panel follows="left|right|bottom|top" height="300" left="-1" mouse_opaque="false"
      user_resize="false" name="overlay" use_bounding_rect="true" width="728">
-	<layout_stack bottom="0" follows="left|right|bottom" height="220" left="0"
+	<layout_stack bottom="0" follows="left|right|bottom" height="300" left="0"
 	     mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
 	     right="-1" use_bounding_rect="true">
 		<layout_panel auto_resize="true" bottom="0" left="0" min_width="420" mouse_opaque="false"

indra/newview/skins/default/xui/en-us/strings.xml

@@ -2174,8 +2174,8 @@ Sets the given permission mask to the new value on the root object the task is a
     Please keep LL-LSL above this section
     ** DATA SOURCES **
        OpenSim OS Functions:      \OpenSim\Region\ScriptEngine\Shared\Api\Interface\IOSSL_Api.cs
-       Aurora-Sim AA Functions:   \Aurora\AuroraDotNetEngine\APIs\AA_API.cs
-       Aurora-Sim BOT Functions:  \Aurora\BotManager\Bot_API.cs
+       WhiteCore AA Functions:    \WhiteCore\ScriptEngine\DotNetEngine\APIs\AA\AA_API.cs
+       WhiteCore BOT Functions:   \WhiteCore\BotManager\Bot_API.cs
 -->
 
 	<string name="LSLTipText_osSetDynamicTextureURL">
@@ -2805,319 +2805,259 @@ list lsGetWindlightScene(list rules)
 Get the current WindLight settings.
 (Reguires LightShare Enabled Viewer)
 	</string>
-<!-- Aurora-Sim OSSL-Functions  (unique to Aurora Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
-   Aurora-Sim aaFunctions (\Aurora\AuroraDotNetEngine\APIs\IAA_Api.cs)
-   Aurora-Sim botFunctions (\Aurora\BotManager\IBot_Api.cs) 
+<!-- WhiteCore OSSL-Functions  (unique to WhiteCore Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
+   WhiteCore aaFunctions (\WhiteCore\ScriptEngine\DotNetEngine\APIs\AA\AA_Api.cs)
+   WhiteCore botFunctions (\WhiteCore\BotManager\Bot_Api.cs)
 -->
 	<string name="LSLTipText_osReturnObject">
 osReturnObject(key userID)
 Returns object to specified avatars UUID.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osReturnObjects">
 osReturnObjects(float Parameter)
 Returns group of objects. Parameter's are numeric, values are owner objects = 0, everyone except owner objects = 1, group objects = 2.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osShutDown">
 osShutDown()
 Shut's down current Simulator.  Authorized Admin Only by config.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osAddAgentToGroup">
 osAddAgentToGroup(key avatarID, string group_name, string role_name)
 Adds an avatar to a group.  Where group_name = name of the target group, role_name = role to assign within the group.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osRezObject">
 osRezObject(string inventory, vector position, vector velocity, rotation rot, integer param, integer isRezAtRoot, integer doRecoil, integer SetDieAtEdge, integer CheckPos)
 Where inventory = object to rez.  Position = vector to rez object.  Velocity = initial velocity.  Rot = initial rotation.  Param = onrez event.
 IzAtRoot = TRUE/FALSE flag changes llRezAtRoot to llRezObject.  doRecoil =TRUE/FALSE to push avatar.  SetDieAtEdge = TRUE/FALSE for rezzed object to die at edge of region.
 CheckPos = TRUE/FALSE enable/disable 10m rez limit.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetCloudDensity">
 aaSetCloudDensity(float density)
 AaSetCloudDensity(0.5)  Where float density values are 0.0 =  no cloud to 1.0 = 100% cloud.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaUpdateDatabase">
 aUpdateDatabase(string Key, string value, string token)
 Where Key = database field name, xmlDataToPutIntoTheDatabase = serialized XML data,  Token = data-password
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaQueryDatabase">
 aaQueryDatabase(string Key, string Token)
 Returns a list with first value is the token, the second the Key, and the third the value
 Where Key = database field name, Token = data-password
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaDeserializeXMLValues">
 aaDeserializeXMLValues(string xmlData)
 Returns a list of Values from XML data. Where xmlData = xml formatted data Values.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaDeserializeXMLKeys">
 aaDeserializeXMLKeys(string xmlData)
 Returns a list of keys from XML data. Where xmlData = xml formatted data keys.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetConeOfSilence">
 aaSetConeOfSilence(float radius)
 Where radius = metres radius from centre of scripted item.  This creates an area that sounds can only be heard by the people within the area(radius) and not heard outside and visa-versa.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSerializeXML">
 aaSerializeXML(list keys, list values)
 Returns xml formatted string of the keys and values.  Where keys = list of keys in the database, values = fields to retrieve from database.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetTeam">
 aaGetTeam(key uuid)
 Returns a string of avatars team name.  Where uuid = avatar key.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetHealth">
 aaGetHealth(key uuid)
 Returns float value (0.0 to 100.0) of current health.  Where uuid = avatar key.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaJoinCombat">
 aaJoinCombat(key uuid)
 Where uuid = avatar key.  If (PERMISSION_COMBAT == PERMISSION_COMBAT) and permission is granted then join combat.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaLeaveCombat">
 aaLeaveCombat(key uuid)
 Where uuid = avatar key.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaJoinCombatTeam">
 aaJoinCombatTeam(key uuid, string team)
 Where uuid = key of avatar, team = string of the team name.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaRequestCombatPermission">
 aaRequestCombatPermission(key ID)
 Where ID = avatar uuid.  Requests target avatar for Permissions to enter into combat mode.
 Raises a run_time_permissions event. (PERMISSION_COMBAT == PERMISSION_COMBAT).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaThawAvatar">
 aaThawAvatar(key ID)
 Where ID = avatar uuid. If combat permission are granted then avatar can be un-frozen (movement re-enabled).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaFreezeAvatar">
 aaFreezeAvatar(key ID)
 Where ID = avatar uuid. If combat permission are granted then avatar can be frozen (no movement).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetTeamMembers">
 aaGetTeamMembers(string team)
 Return a list of team members.  Where team = string of team name.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetLastOwner">
     POLYMORPHIC FUNCTION.
 aaGetLastOwner(string PrimID)  returns last owner UUID of PrimID where PrimID = uuid of prim.
 AaGetLastOwner()  returns last owner uuid of prim containg script.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSayDistance">
 aaSayDistance(integer channelID, float Distance, string text)
 Where channelID = channel to say on, Distance = float in meters  for distance to say, text = string to say.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSayTo">
 aaSayTo(key userID, string text)
 Where userID = avatar key, text = string msg.  Similar to llOwnerSay but can be directly targeted to an avatar.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetWalkDisabled">
 aaGetWalkDisabled(key ID)
 Returns integer of TRUE or FALSE for specifid ID.  Where ID = avatar uuid.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetWalkDisabled">
 aaSetWalkDisabled(key ID, integer Value)
 Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetFlyDisabled">
 aaGetFlyDisabled(key ID)
 Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetFlyDisabled">
 aaSetFlyDisabled(key ID, integer Value)
 Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaAvatarFullName2Key">
 aaAvatarFullName2Key(string FullName)
 Returns the avatar uuid from their fullname.  Where FullName = "Firstname Lastname”.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaRaiseError">
 aaRaiseError(string message)
 Allows you to have errors that end the execution of the event and fire another event in the script.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetText">
 aaGetText()
 Returns a string of the hover text of an object.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetTextColor">
 aaGetTextColor()
 Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s  Where s = value of alpha in llSetText.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetEnv">
 aaSetEnv(string EnvName, list Value)
 Sets environment values.  Where EnvName = ENABLE_GRAVITY, GRAVITY_FORCE_X, GRAVITY_FORCE_Y, GRAVITY_FORCE_Z, ADD_GRAVITY_POINT, ADD_GRAVITY_FORCE, START_TIME_REVERSAL_SAVING,
 STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetIsInfiniteRegion">
 aaGetIsInfiniteRegion()
 Returns TRUE or FALSE if region is an infinite region.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetCharacterStat">
 aaSetCharacterStat( ID, StatName, statValue)
 Sets Character Stats.  Where ID = avatar uuid, StatName = stat to change, statValue the value to change it to.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaAllRegionInstanceSay">
 aaAllRegionInstanceSay(integer channelID, string text)
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetDayCycle">
 aaWindlightGetDayCycle()
 Returns a List of settings
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightAddDayCycleFrame">
 aaWindlightAddDayCycleFrame(float dayCyclePosition, integer dayCycleFrameToCopy)
 Returns TRUE / FALSE on success status
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightRemoveDayCycleFrame">
 aaWindlightRemoveDayCycleFrame(int dayCycleFrame)
 Returns TRUE / FALSE on success status
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightSetScene">
 aaWindlightSetScene(list list)
 aaWindlightSetScene(integer dayCycleIndex, list list)
 Returns TRUE/FALSE on success
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetScene">
 aaWindlightGetScene(list rules)
 aaWindlightGetScene(integer dayCycleKeyFrame, list rules)
 Returns a list
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetSceneIsStatic">
 aaWindlightGetSceneIsStatic()
 Returns TRUE / FALSE
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetSceneDayCycleKeyFrameCount">
 aaWindlightGetSceneDayCycleKeyFrameCount()
 Returns integer value
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botGetWaitingTime">
 botGetWaitingTime(integer waitTime)
 Returns waitTime as vector.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSetMap">
 botSetMap(key keyOfBot, list positions, list movementType, integer flags)
 keyOfBot = bot uuid, positions = list of position vectors, movementType = corresponding list of move modes:  0 – walk, 1 – fly,
 flags = BOT_FOLLOW_FLAG_NONE and BOT_FOLLOW_FLAG_INDEFINITELY.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botCreateBot">
 botCreateBot(string FirstName, string LastName, key idToClone, vector startPos)
 Where FirstName and LastName = strings for new bot name.  idToClone = uuid of prebuild avatar to clone OR another existing avatar.  startPos = vector of starting position on region.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botRemoveBot">
 botRemoveBot(key botID)
 Where botID = uuid of bot.  Removes bot identified by botID.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botPauseMovement">
 botPauseMovement(key botID)
 Where botID = bot uuid.  Pauses bot at current position.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botResumeMovement">
 botResumeMovement(key botID)
 Where botID = bot uuid.  Resumes bot movement.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botFollowAvatar">
 botFollowAvatar(key botID, string avName, float startFollowDistance, float endFollowDistance)
 Where botID = bot uuid.  AvName = sting of avatar name OR avatar uuid.  StartFollowDistance = distance to start following from.  EndFollowDistance = distance to stop following avatar.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botStopFollowAvatar">
 botStopFollowAvatar(key botID)
 Where botID = bot uuid.  Stops bot from following an avatar.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSendChatMessage">
 botSendChatMessage(key botID, string message, integer channel, integer sayType)
 Where  botID = bot uuid.  Message = string msg.  Channel = channel to speak on.  SayType = (0=whisper, 1=say, 2=shout).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSendIM">
 botSendIM(string bot, string user, string message)
 Send IM to bot.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSetShouldFly">
 botSetShouldFly(key botID, integer ShouldFly)
 Where botID = bot uuid.  ShouldFly = TRUE/FALSE.  Enables or disables flight mode.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSitObject">
 botSitObject(key botID, key objectID, vector offset)
 Where botID = bot uuid,  objectID = uuid of object to sit on,  offset = Vector for sit position (note that VECTOR_ZERO = default sit pos).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botStandUp">
 botStandUp(key botID)
 Where botID = bot uuid.  Command bot to stand up.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botTouchObject">
 botTouchObject(key botID, key objectID)
 Where botID = bot uuid,  objectID = object uuid.  Causes bot to touch object identified.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botAddTag">
 botAddTag(key botID, string tag)
 Where botID = bot uuid,  tag = string tag over bot.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botGetBotsWithTag">
 botGetBotsWithTag(string tag)
 Where tag = tag string to match.  Return a list of bot UUID's in region with the matching tag.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botRemoveBotsWithTag">
 botRemoveBotsWithTag(string tag)
 Where tag = tag string to match.  Removes bot's matching the tag.
-(Aurora-Sim only)
 	</string>
-<!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
+<!-- *** END OF OpenSimulator & WhiteCore syntax section *** -->
 
 	<!-- Strings needed by drop targets -->
 	<string name="CurrentlyNotSet">Item currently not set</string>

indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" height="200" name="Adv_Settings" use_bounding_rect="true" width="220">
-	<panel bottom="1" filename="panel_bg_tab.xml" height="214" width="197"/>
-	<text bottom="189" left="5" height="20" width="190" name="Camera Preset:">Cam Preset:</text>
-	<button bottom="191" left="81" width="20" height="20" label="" toggle="true" image_selected="Cam_Preset_Back_On.png" image_unselected="Cam_Preset_Back_Off.png" name="Rear" tool_tip="Rear View">
+<panel bg_visible="false" border="false" border_visible="false" height="220" name="Adv_Settings" use_bounding_rect="true" width="220">
+	<panel bottom="1" filename="panel_bg_tab.xml" height="234" width="197"/>
+	<text bottom="-9" left="5" height="20" width="190" name="Camera Preset:">Cam Preset:</text>
+	<button bottom_delta="2" left="81" width="20" height="20" label="" toggle="true" image_selected="Cam_Preset_Back_On.png" image_unselected="Cam_Preset_Back_Off.png" name="Rear" tool_tip="Rear View">
 		<button.commit_callback function="Wlf.ChangeCameraPreset" parameter="0"/>
 	</button>
 	<button bottom_delta="0" left_delta="20" width="20" height="20" label="" toggle="true" image_selected="Cam_Preset_Front_On.png" image_unselected="Cam_Preset_Front_Off.png" name="Front" tool_tip="Front View">
@@ -16,6 +16,10 @@
 	<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="60" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="190" tool_tip="Amount of particles to render"/>
 	<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="60" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="190" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
 	<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="60"  max_val="4" min_val="0.5" name="Object Detail" val_width="36" width="190" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>
+	<button bottom_delta="-22" left="5" height="20" name="PostProcessButton" width="20" image_overlay="Inv_Post_Process.png" label="" tool_tip="Post Process Effects"/>
+	<combo_box name="PostProcessPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="131" tool_tip="Post Process Presets"/>
+	<button bottom_delta="-1" height="19" label="&lt;" left="157" image_overlay="arrow_left.tga" name="PPprev" scale_image="true" width="19"/>
+	<button bottom_delta="0" height="19" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="PPnext" width="19"/>
 	<button bottom_delta="-22" left="5" height="20" name="EnvAdvancedSkyButton" width="20" image_overlay="Inv_WindLight.png" label="" tool_tip="Advanced Sky"/>
 	<combo_box name="WLSkyPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="131" tool_tip="WindLight Presets for your Sky."/>
 	<button bottom_delta="-1" height="19" label="&lt;" left="157" image_overlay="arrow_left.tga" name="WLprev" scale_image="true" width="19"/>
@@ -26,7 +30,7 @@
 	<button bottom_delta="0" height="19" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="WWnext" width="19"/>
 	<check_box left="5" label="Region WL" control_name="UseEnvironmentFromRegion" height="16" name="use_estate_wl" tool_tip="Use the region's windlight settings when available."/>
 <!--check_box bottom_delta="0" left_delta="125" label="Always?" control_name="UseEnvironmentFromRegionAlways" height="16" name="Always" tool_tip="Always use region/parcel settings when they exist, automatically."/-->
-	<check_box bottom_delta="0" left_delta="110" label="Crossfade?" control_name="PhoenixInterpolateSky" height="16" name="Crossfade" tool_tip="If unchecked, Sky Windlight settings changes will apply immediately, without hesitation/animation."/>
+	<check_box bottom_delta="0" left_delta="100" label="Crossfade?" control_name="PhoenixInterpolateSky" height="16" name="Crossfade" tool_tip="If unchecked, Sky Windlight settings changes will apply immediately, without hesitation/animation."/>
 	<icon bottom_delta="-18" height="14" image_name="icon_day_cycle.tga" left="10" width="150"/>
 	<slider bottom_delta="-8" control_name="EnvTimeSlider" left="5" height="10" increment="0.00000001" label="" max_val="1" min_val="0" name="EnvTimeSlider" show_text="false" width="160"/>
 	<button bottom="1" height="22" label="" left="172" name="expand" scale_image="true" image_overlay="arrow_down.tga" toggle="true" tool_tip="Hide the Settings Panel" width="22"/>

indra/newview/skins/default/xui/es/menu_local_avs.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Local Avs Menu">
+	<menu label="Avatar" name="Avatar">
+		<menu_item_call label="Perfil" name="Profile"/>
+		<menu_item_call label="Perfil Web" name="Web Profile"/>
+		<menu_item_call label="Pagar" name="Pay"/>
+		<menu_item_call label="Mensaje Instantáneo" name="Instant Message"/>
+		<menu_item_call label="Conferencia" name="Conference Chat"/>
+		<menu_item_call label="Iniciar Llamada" name="Call"/>
+		<menu_item_call label="Iniciar Conferencia" name="Conference Call"/>
+		<menu_item_call label="Agregar Contacto" name="Add Friend"/>
+		<menu_item_call label="Remover Contacto" name="Remove Friend"/>
+		<menu_item_call label="Invitar a Grupo" name="Invite To Group"/>
+		<menu_item_call label="Ofrecer Teleporte" name="Offer Teleport"/>
+		<menu_item_call label="Teleportar a" name="Teleport To"/>
+		<menu_item_call label="Solicitar Teleporte" name="Request Teleport"/>
+		<menu_item_call label="Compartir" name="Share"/>
+		<menu_item_call label="Historial de Chat" name="Chat History"/>
+		<menu_item_call label="Rastrear/Dejar de Rastrear" name="Track/Untrack"/>
+		<menu_item_call label="Copiar UUID" name="Copy Key"/>
+		<menu_item_call label="Copiar SLURL" name="Copy SLURL"/>
+	</menu>
+	<menu_item_call label="Enfocar" name="Focus"/>
+	<menu label="Moderación" name="Moderation">
+		<menu_item_call label="Silenciar/No Silenciar" name="Mute/Unmute"/>
+		<menu_item_call label="Prohibir en el Grupo" name="Ban From Group"/>
+		<menu_item_call label="Denunciar una Infracción" name="Report Abuse"/>
+		<menu_item_call label="Congelar" name="Freeze"/>
+		<menu_item_call label="Expulsar/Prohibir en la Parcela" name="Eject/Ban from Parcel"/>
+		<menu_item_call label="Expulsar del Estado" name="Eject from estate"/>
+		<menu_item_call label="Expulsar y prohibir en el Estado" name="Eject and ban from estate"/>
+	</menu>
+</menu>

indra/newview/skins/default/xui/es/menu_texteditor.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="rclickmenu">
+	<menu_item_call label="Cortar" name="Cut"/>
+	<menu_item_call label="Copiar" name="Copy"/>
+	<menu_item_call label="Copia en crudo" name="Copy Raw"/>
+	<menu_item_call label="Pegar" name="Paste"/>
+	<menu_item_call label="Borrar" name="Delete"/>
+	<menu_item_call label="Seleccionar Todo" name="Select All"/>
+</menu>

indra/newview/skins/default/xui/es/menu_url_agent_mini.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu label="Usuario" name="Url Mini Popup">
+	<menu_item_call label="Ver Perfil" name="show_agent"/>
+	<menu_item_call label="Copiar Nombre al portapapeles" name="url_copy_label"/>
+	<menu_item_call label="Copiar SLurl al portapapeles" name="url_copy"/>
+	<menu_item_call label="Seleccionar Todo" name="Select All"/>
+</context_menu>

indra/newview/skins/default/xui/es/strings.xml

@@ -2166,8 +2166,8 @@ Sets the given permission mask to the new value on the root object the task is a
     Please keep LL-LSL above this section
     ** DATA SOURCES **
        OpenSim OS Functions:      \OpenSim\Region\ScriptEngine\Shared\Api\Interface\IOSSL_Api.cs
-       Aurora-Sim AA Functions:   \Aurora\AuroraDotNetEngine\APIs\AA_API.cs
-       Aurora-Sim BOT Functions:  \Aurora\BotManager\Bot_API.cs
+       WhiteCore AA Functions:    \WhiteCore\ScriptEngine\DotNetEngine\APIs\AA\AA_API.cs
+       WhiteCore BOT Functions:   \WhiteCore\BotManager\Bot_API.cs
 -->
 
 	<string name="LSLTipText_osSetDynamicTextureURL">
@@ -2796,319 +2796,259 @@ list lsGetWindlightScene(list rules)
 Get the current WindLight settings.
 (Reguires LightShare Enabled Viewer)
 	</string>
-<!-- Aurora-Sim OSSL-Functions  (unique to Aurora Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
-   Aurora-Sim aaFunctions (\Aurora\AuroraDotNetEngine\APIs\IAA_Api.cs)
-   Aurora-Sim botFunctions (\Aurora\BotManager\IBot_Api.cs) 
+<!-- WhiteCore OSSL-Functions  (unique to WhiteCore Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
+   WhiteCore aaFunctions (\WhiteCore\ScriptEngine\DotNetEngine\APIs\AA\AA_Api.cs)
+   WhiteCore botFunctions (\WhiteCore\BotManager\Bot_Api.cs)
 -->
 	<string name="LSLTipText_osReturnObject">
 osReturnObject(key userID)
 Returns object to specified avatars UUID.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osReturnObjects">
 osReturnObjects(float Parameter)
 Returns group of objects. Parameter's are numeric, values are owner objects = 0, everyone except owner objects = 1, group objects = 2.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osShutDown">
 osShutDown()
 Shut's down current Simulator.  Authorized Admin Only by config.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osAddAgentToGroup">
 osAddAgentToGroup(key avatarID, string group_name, string role_name)
 Adds an avatar to a group.  Where group_name = name of the target group, role_name = role to assign within the group.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_osRezObject">
 osRezObject(string inventory, vector position, vector velocity, rotation rot, integer param, integer isRezAtRoot, integer doRecoil, integer SetDieAtEdge, integer CheckPos)
 Where inventory = object to rez.  Position = vector to rez object.  Velocity = initial velocity.  Rot = initial rotation.  Param = onrez event.
 IzAtRoot = TRUE/FALSE flag changes llRezAtRoot to llRezObject.  doRecoil =TRUE/FALSE to push avatar.  SetDieAtEdge = TRUE/FALSE for rezzed object to die at edge of region.
 CheckPos = TRUE/FALSE enable/disable 10m rez limit.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetCloudDensity">
 aaSetCloudDensity(float density)
 AaSetCloudDensity(0.5)  Where float density values are 0.0 =  no cloud to 1.0 = 100% cloud.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaUpdateDatabase">
 aUpdateDatabase(string Key, string value, string token)
 Where Key = database field name, xmlDataToPutIntoTheDatabase = serialized XML data,  Token = data-password
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaQueryDatabase">
 aaQueryDatabase(string Key, string Token)
 Returns a list with first value is the token, the second the Key, and the third the value
 Where Key = database field name, Token = data-password
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaDeserializeXMLValues">
 aaDeserializeXMLValues(string xmlData)
 Returns a list of Values from XML data. Where xmlData = xml formatted data Values.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaDeserializeXMLKeys">
 aaDeserializeXMLKeys(string xmlData)
 Returns a list of keys from XML data. Where xmlData = xml formatted data keys.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetConeOfSilence">
 aaSetConeOfSilence(float radius)
 Where radius = metres radius from centre of scripted item.  This creates an area that sounds can only be heard by the people within the area(radius) and not heard outside and visa-versa.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSerializeXML">
 aaSerializeXML(list keys, list values)
 Returns xml formatted string of the keys and values.  Where keys = list of keys in the database, values = fields to retrieve from database.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetTeam">
 aaGetTeam(key uuid)
 Returns a string of avatars team name.  Where uuid = avatar key.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetHealth">
 aaGetHealth(key uuid)
 Returns float value (0.0 to 100.0) of current health.  Where uuid = avatar key.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaJoinCombat">
 aaJoinCombat(key uuid)
 Where uuid = avatar key.  If (PERMISSION_COMBAT == PERMISSION_COMBAT) and permission is granted then join combat.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaLeaveCombat">
 aaLeaveCombat(key uuid)
 Where uuid = avatar key.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaJoinCombatTeam">
 aaJoinCombatTeam(key uuid, string team)
 Where uuid = key of avatar, team = string of the team name.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaRequestCombatPermission">
 aaRequestCombatPermission(key ID)
 Where ID = avatar uuid.  Requests target avatar for Permissions to enter into combat mode.
 Raises a run_time_permissions event. (PERMISSION_COMBAT == PERMISSION_COMBAT).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaThawAvatar">
 aaThawAvatar(key ID)
 Where ID = avatar uuid. If combat permission are granted then avatar can be un-frozen (movement re-enabled).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaFreezeAvatar">
 aaFreezeAvatar(key ID)
 Where ID = avatar uuid. If combat permission are granted then avatar can be frozen (no movement).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetTeamMembers">
 aaGetTeamMembers(string team)
 Return a list of team members.  Where team = string of team name.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetLastOwner">
     POLYMORPHIC FUNCTION.
 aaGetLastOwner(string PrimID)  returns last owner UUID of PrimID where PrimID = uuid of prim.
 AaGetLastOwner()  returns last owner uuid of prim containg script.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSayDistance">
 aaSayDistance(integer channelID, float Distance, string text)
 Where channelID = channel to say on, Distance = float in meters  for distance to say, text = string to say.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSayTo">
 aaSayTo(key userID, string text)
 Where userID = avatar key, text = string msg.  Similar to llOwnerSay but can be directly targeted to an avatar.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetWalkDisabled">
 aaGetWalkDisabled(key ID)
 Returns integer of TRUE or FALSE for specifid ID.  Where ID = avatar uuid.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetWalkDisabled">
 aaSetWalkDisabled(key ID, integer Value)
 Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetFlyDisabled">
 aaGetFlyDisabled(key ID)
 Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetFlyDisabled">
 aaSetFlyDisabled(key ID, integer Value)
 Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaAvatarFullName2Key">
 aaAvatarFullName2Key(string FullName)
 Returns the avatar uuid from their fullname.  Where FullName = "Firstname Lastname”.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaRaiseError">
 aaRaiseError(string message)
 Allows you to have errors that end the execution of the event and fire another event in the script.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetText">
 aaGetText()
 Returns a string of the hover text of an object.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetTextColor">
 aaGetTextColor()
 Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s  Where s = value of alpha in llSetText.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetEnv">
 aaSetEnv(string EnvName, list Value)
 Sets environment values.  Where EnvName = ENABLE_GRAVITY, GRAVITY_FORCE_X, GRAVITY_FORCE_Y, GRAVITY_FORCE_Z, ADD_GRAVITY_POINT, ADD_GRAVITY_FORCE, START_TIME_REVERSAL_SAVING,
 STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaGetIsInfiniteRegion">
 aaGetIsInfiniteRegion()
 Returns TRUE or FALSE if region is an infinite region.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaSetCharacterStat">
 aaSetCharacterStat( ID, StatName, statValue)
 Sets Character Stats.  Where ID = avatar uuid, StatName = stat to change, statValue the value to change it to.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaAllRegionInstanceSay">
 aaAllRegionInstanceSay(integer channelID, string text)
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetDayCycle">
 aaWindlightGetDayCycle()
 Returns a List of settings
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightAddDayCycleFrame">
 aaWindlightAddDayCycleFrame(float dayCyclePosition, integer dayCycleFrameToCopy)
 Returns TRUE / FALSE on success status
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightRemoveDayCycleFrame">
 aaWindlightRemoveDayCycleFrame(int dayCycleFrame)
 Returns TRUE / FALSE on success status
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightSetScene">
 aaWindlightSetScene(list list)
 aaWindlightSetScene(integer dayCycleIndex, list list)
 Returns TRUE/FALSE on success
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetScene">
 aaWindlightGetScene(list rules)
 aaWindlightGetScene(integer dayCycleKeyFrame, list rules)
 Returns a list
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetSceneIsStatic">
 aaWindlightGetSceneIsStatic()
 Returns TRUE / FALSE
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_aaWindlightGetSceneDayCycleKeyFrameCount">
 aaWindlightGetSceneDayCycleKeyFrameCount()
 Returns integer value
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botGetWaitingTime">
 botGetWaitingTime(integer waitTime)
 Returns waitTime as vector.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSetMap">
 botSetMap(key keyOfBot, list positions, list movementType, integer flags)
 keyOfBot = bot uuid, positions = list of position vectors, movementType = corresponding list of move modes:  0 – walk, 1 – fly,
 flags = BOT_FOLLOW_FLAG_NONE and BOT_FOLLOW_FLAG_INDEFINITELY.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botCreateBot">
 botCreateBot(string FirstName, string LastName, key idToClone, vector startPos)
 Where FirstName and LastName = strings for new bot name.  idToClone = uuid of prebuild avatar to clone OR another existing avatar.  startPos = vector of starting position on region.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botRemoveBot">
 botRemoveBot(key botID)
 Where botID = uuid of bot.  Removes bot identified by botID.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botPauseMovement">
 botPauseMovement(key botID)
 Where botID = bot uuid.  Pauses bot at current position.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botResumeMovement">
 botResumeMovement(key botID)
 Where botID = bot uuid.  Resumes bot movement.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botFollowAvatar">
 botFollowAvatar(key botID, string avName, float startFollowDistance, float endFollowDistance)
 Where botID = bot uuid.  AvName = sting of avatar name OR avatar uuid.  StartFollowDistance = distance to start following from.  EndFollowDistance = distance to stop following avatar.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botStopFollowAvatar">
 botStopFollowAvatar(key botID)
 Where botID = bot uuid.  Stops bot from following an avatar.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSendChatMessage">
 botSendChatMessage(key botID, string message, integer channel, integer sayType)
 Where  botID = bot uuid.  Message = string msg.  Channel = channel to speak on.  SayType = (0=whisper, 1=say, 2=shout).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSendIM">
 botSendIM(string bot, string user, string message)
 Send IM to bot.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSetShouldFly">
 botSetShouldFly(key botID, integer ShouldFly)
 Where botID = bot uuid.  ShouldFly = TRUE/FALSE.  Enables or disables flight mode.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botSitObject">
 botSitObject(key botID, key objectID, vector offset)
 Where botID = bot uuid,  objectID = uuid of object to sit on,  offset = Vector for sit position (note that VECTOR_ZERO = default sit pos).
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botStandUp">
 botStandUp(key botID)
 Where botID = bot uuid.  Command bot to stand up.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botTouchObject">
 botTouchObject(key botID, key objectID)
 Where botID = bot uuid,  objectID = object uuid.  Causes bot to touch object identified.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botAddTag">
 botAddTag(key botID, string tag)
 Where botID = bot uuid,  tag = string tag over bot.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botGetBotsWithTag">
 botGetBotsWithTag(string tag)
 Where tag = tag string to match.  Return a list of bot UUID's in region with the matching tag.
-(Aurora-Sim only)
 	</string>
 	<string name="LSLTipText_botRemoveBotsWithTag">
 botRemoveBotsWithTag(string tag)
 Where tag = tag string to match.  Removes bot's matching the tag.
-(Aurora-Sim only)
 	</string>
-<!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
+<!-- *** END OF OpenSimulator & WhiteCore syntax section *** -->
 
 	<!-- Strings needed by drop targets -->
 	<string name="CurrentlyNotSet">No definido actualmente </string>