Liru Færs
90e6afe159
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2020-01-10 17:14:39 -05:00
Liru Færs
3209507b6c
[Follow] Sit if target is sitting, stand when they stand
...
Does object and ground sitting.
May fly to sitting target if they're in air
Ground sits as close as it can get if cannot reach ground sitting target
Optimizes following when within desired range of target
Moves sitting/standing autopilot cancels to more proper places
2020-01-10 17:13:28 -05:00
Liru Færs
fa97d8497a
[Follow] If the user decides to sit/stand, that should cancel following
2020-01-10 16:47:52 -05:00
Liru Færs
a687273d57
Default column sorting to list sort_ascending attribute value
2020-01-10 16:07:37 -05:00
Liru Færs
28f13b806c
Some harmless reorganization
2020-01-10 16:06:44 -05:00
Liru Færs
f1342d7bb8
Fix Name List xml processing (and typing into them to +find names!)
...
LLNameListCtrl::fromXML was ancient,
and LLScrollListCtrl::fromXML had been getting updated
but that processing should be done in a common virtual function so we have
a valid hierarchy! This fixes that!
Now all of the modern amenities added to scroll lists are in name lists.
2020-01-10 15:49:12 -05:00
Liru Færs
c3428c6d57
When chat scrolls, IDBearer URL menus shouldn't lead to the wrong place
...
Optimizes away multiple iterations over scroll lists and
multiple parsings of urls to determine the target(s)
At the cost of the last selection being stored statically in a vector
Removes virtual LFIDBearer::getNumSelected
2020-01-10 14:46:54 -05:00
Liru Færs
0efddbd9ff
Add Pay to Object UI Menus
2020-01-10 13:12:13 -05:00
Liru Færs
be0aba4bfa
Woops, fix this
2020-01-10 03:34:57 -05:00
Liru Færs
c3f03b6bbf
[Follow] Specify that Follow has been cancelled, with Cancelled notice
2020-01-10 03:11:19 -05:00
Liru Færs
e15839a2cb
Move autoPilot Agent Avatar Valid check to beginning
2020-01-10 02:42:48 -05:00
Shyotl
e0efbd7d26
Fix two race conditions in meshrepo.
2020-01-10 00:09:35 -06:00
Liru Færs
8e57288819
Stand Up by user should cancel autopilot
2020-01-10 01:01:38 -05:00
Liru Færs
107f512545
Teleport notifications now use avatar slurls
2020-01-09 22:53:16 -05:00
Liru Færs
14dc348179
Add Sit On to Object UI Menus
...
Breaks handle_object_sit out of handle_object_sit_or_stand,
parameterizes offset so that one doesn't need to select a side
still respects RLV, yay~
2020-01-09 22:14:06 -05:00
Liru Færs
eccbd98d79
Change some enables to visibles
2020-01-09 21:18:31 -05:00
Liru Færs
a5115aa69e
Fix Crash T, someone broke their install, but we should gracefully exit
2020-01-09 12:41:43 -05:00
Liru Færs
327574db7c
Cancel autopilot when user initiates a goto
2020-01-08 22:32:17 -05:00
Liru Færs
8b4a29cbd3
Break simulator autopilot out into its own function
2020-01-08 22:31:18 -05:00
Liru Færs
544feee19f
Fix Copy Names in Object Menu not working, oops!!
2020-01-08 20:48:48 -05:00
Liru Færs
bee60da089
Break out get_obj_data into its own function
2020-01-08 20:43:47 -05:00
Liru Færs
c466b44143
Introduce rudimentary objects list menu for Area Search
...
Enables multiselect in areasearch
2020-01-08 20:09:46 -05:00
Liru Færs
27222d524c
Add Object support to List.ShowProfile, via get_slurl_for
2020-01-08 19:49:52 -05:00
Liru Færs
b99e2cbbdd
Add support for OBJECT type to get_slurl_for
...
Caveat: Requires area search to be instantiated (should we break this out?)
Only includes location if in object list
2020-01-08 19:48:50 -05:00
Liru Færs
a5bdc24a14
Refactor get_slurl_for
2020-01-08 19:46:42 -05:00
Liru Færs
0b6d94f202
Request: Change "Log" button on IM Floater to "History"
...
This is more clear and consistent with all the other places this is used
2020-01-08 19:43:27 -05:00
Liru Færs
bf5035388b
Expose ObjectData from AreaSearch
2020-01-08 19:22:36 -05:00
Liru Færs
640c136bcc
Add Cam To to Object URL menu
2020-01-08 19:13:36 -05:00
Liru Færs
6ebd2eef00
Feature Request: Add Chat History to Group right click menus
2020-01-08 19:11:46 -05:00
Liru Færs
c954d02125
Add missing Go To to object pie menu
2020-01-08 18:00:51 -05:00
Liru Færs
a34414849c
Sync some of llcommandlineparser with alchemy
...
Might fix Crash R
2020-01-08 17:07:49 -05:00
Liru Færs
c1ffb1b332
[Follow] Do not fly unless flying avatar target or already flying
2020-01-08 16:58:54 -05:00
Liru Færs
d06448cdfd
Remove dead german menu entry
2020-01-08 16:53:23 -05:00
Liru Færs
117ef68916
Put object pie Follow where it was actually supposed to go
...
Thanks for the heads up on this mistake, Router!
2020-01-08 16:07:23 -05:00
Liru Færs
83b384ab97
Combine Marking from Minimap with Radar Mark
...
Color people right from the Radar!
Mark button on Radar now uses Red.
Removes "Radar.Mark" and its associated code
Thanks for the help on linux, Router!
2020-01-08 15:54:43 -05:00
Liru Færs
5ee5ba473b
Small refactor of minimap marking code
...
Mark is now encapsulated
mm_setcolor is no longer part of LLNetMap
mm_clearMark is now used to erase mark from container
Introduces mm_getMarkerColor that returns a pointer,
instead of needing a ref every time.
Also mark isAgentUnderCursor const
2020-01-08 15:39:49 -05:00
Liru Færs
4055af4afd
Add Mark menu to radar
2020-01-08 15:23:51 -05:00
Liru Færs
65dad7acfd
Remove weird double newline between single avatar on minimap and distance
2020-01-08 14:53:08 -05:00
Liru Færs
a21927e510
[Follow] If target av isn't rendered, still try to get their position
...
Mainly moves code around, rather small change.
2020-01-08 13:15:37 -05:00
Liru Færs
094c948a87
Move Minimap Mark submenu back out of Selected Avatars menu for convenience
2020-01-08 13:12:13 -05:00
Liru Færs
31003f13af
Fix Crash on text editor right click
...
Fixes Crashes N and P
Missing nullcheck, my bad
Never expected there not to be a menu segment url when a menu is open
2020-01-08 10:25:44 -05:00
Router Gray
c1f39e167c
Bang bang on the list baby
2020-01-07 20:00:50 -06:00
Router Gray
0e28436aa9
Fix invalid initialization of non-const reference
2020-01-07 19:59:53 -06:00
Liru Færs
bc1c816b99
Fix right click local avatar url menu's Focus being broken
2020-01-07 19:21:06 -05:00
Liru Færs
32424e5640
Fix up presentation of radar and local avs menus
2020-01-07 19:19:05 -05:00
Liru Færs
760f1308f3
Add SinguFollowDistance for setting minimum follow distance
2020-01-07 18:51:49 -05:00
Liru Færs
dfe8e364be
Add Follow to pie and right click UI menus for objects and avatars
2020-01-07 18:51:18 -05:00
Liru Færs
33feeb0a01
Make Follow Great Again!
2020-01-07 17:40:43 -05:00
Liru Færs
50eb21ce23
This never got reset... weird
2020-01-07 16:48:27 -05:00
Liru Færs
d2052b9e4c
Teleport and move to objects by their IM name links
2020-01-07 15:00:31 -05:00
Liru Færs
2c5ad97697
*Shakes cane* Get off my lawn, you young whippersnapper!
2020-01-07 14:21:24 -05:00
Liru Færs
8283422717
Rename Radar.TeleportTo to List.TeleportTo, and move the code
2020-01-07 11:53:23 -05:00
Liru Færs
4a293ff1e1
Clean up excess teleport to code using get_av_pos
2020-01-07 11:46:06 -05:00
Liru Færs
828307ca96
Sync LLSDSerialize with alchemy, and merge fix for Crash K
2020-01-07 11:00:21 -05:00
Liru Færs
a83901d2e4
Add ARC to avatar hover tips
2020-01-07 10:57:58 -05:00
Liru Færs
878ba534b5
Add Land Impact to object hover tip
2020-01-07 10:46:39 -05:00
Liru Færs
f17e6637d6
Use findAvatar instead of findObject
2020-01-07 10:39:56 -05:00
Liru Færs
66b2ad5f30
Actually fix crash 1, 5, and J
...
Removes a bad fix for beware's crash from forever ago
2020-01-07 08:12:01 -05:00
Liru Færs
463151c830
Fix crash and generaly wrong duplicate attribute name
...
NameUI "type" is now "id_type"
Thanks for the help, Router!
2020-01-07 06:19:24 -05:00
Liru Færs
77b6a903ac
Remove spurious extra /* in rlvactions.h, thanks Router!
2020-01-07 05:13:37 -05:00
Liru Færs
1813a7bf8b
[LLNameUI] Handle LFIDBearer::Type instead of jusst group or not
...
Removes "is_group" and switches it out for "type"
setValue no longer takes "group", instead it takes "type"
Constructors and setNameID now take Type instead of a boolean
setIsGroup is now setType
2020-01-06 12:31:43 -05:00
Liru Færs
6839cba56a
Encapsulate LFIDBearer::sActive, set with member setActive
...
This function caches the current type when active,
in the future it could be more useful than that.
sActive is now const, getActive returns const,
IDBearers display information, the interface should only be used for that
2020-01-06 12:22:31 -05:00
Liru Færs
f73fb6424b
Const qualify copy
2020-01-06 12:14:13 -05:00
Liru Færs
af2ae76ca2
[NameUI] Remove pointless is_group check in refresh
2020-01-06 07:54:18 -05:00
Liru Færs
a870534ea0
This slipped out of an earlier commit, woops.
2020-01-06 03:03:04 -05:00
Liru Færs
ba61314c32
Add Copy Name to radar menu and Move To to radar and avatar url menus
2020-01-06 02:40:22 -05:00
Liru Færs
d32e478456
Clean up some string character literals
2020-01-06 02:16:44 -05:00
Liru Færs
1b29210f16
Feature Request: Add a setting to control the output of key2name command
...
AscentCmdLineKeyToNameNameSystem
2020-01-06 01:57:26 -05:00
Liru Færs
760f23b370
Sync with upstream to make the simulator version change notification useful
2020-01-06 01:54:30 -05:00
Liru Færs
a7cba5f1a3
Add Alchemy's /sethome command
2020-01-05 23:27:51 -05:00
Liru Færs
27033f4ebb
Add /setchannel command to set the nearby chat channel, from Alchemy
2020-01-05 23:27:13 -05:00
Liru Færs
c772179149
Add RlvCommandOption support for Attachment UUID
2020-01-05 23:26:09 -05:00
Liru Færs
4c7eacf4fc
Remove unused code
2020-01-05 23:25:36 -05:00
Liru Færs
672037d1f2
Sync LLChatBar with alchemy's LLChatBar and LLChatUtilities
...
Stops typing anim on chatbar focus loss
Makes a couple classes final
Adds checkChatVolume and canSendChannel to RlvActions
Updates other bits of Rlv, but adds no functionality
2020-01-05 23:25:22 -05:00
Liru Færs
80cedb913a
Make Folder inventory window prettier
2020-01-05 17:41:26 -05:00
Liru Færs
734621be82
Add Move To to avatar right click menus
2020-01-05 16:25:55 -05:00
Liru Færs
dd3944161d
Fix uninitialized member variable
2020-01-05 15:45:14 -05:00
Liru Færs
1aabbb13c0
Woops, this slipped out of a previous commit.
2020-01-05 15:44:46 -05:00
Liru Færs
5574f263b1
Fix crash in LLControlAvatar::matchVolumeTransform() from Kitty Barnett
2020-01-05 15:44:31 -05:00
Liru Færs
2117c66c9a
Further LLControlAvatar sync with Alchemy
2020-01-05 15:41:22 -05:00
Liru Færs
1fbfc498bf
Change signature of handle_go_to to be more versatile
2020-01-05 15:39:35 -05:00
Liru Færs
a02693e4dd
[Animesh] Hook up more missing parts of LLControlAvatar, maybe fix stuff?
2020-01-05 00:08:26 -05:00
Liru Færs
24118e8e67
[Animesh] Hook up isImposter override for control avatars
2020-01-05 00:07:36 -05:00
Liru Færs
19ad64cc96
AlchSync: Change dynamic_casts to LLVOVolume to asVolume()
2020-01-04 23:31:15 -05:00
Liru Færs
e81affce51
Harmless Alchemy sync
...
CachedControls, autos, cleaner loops, remove overkill dynamic cast,
and override and final
2020-01-04 23:25:29 -05:00
Liru Færs
dec0bff972
Fix Crash C: mRootVolp wasn't being set null on mark for death
2020-01-04 21:36:47 -05:00
Liru Færs
5daf4aa777
Fix a shutdown crash (Crash B)
2020-01-04 19:46:17 -05:00
Liru Færs
2f24a53a01
Clean up some code
2020-01-04 12:15:00 -05:00
Liru Færs
28af96229b
Cleaner port of Ansariel's fix for Attachment loss on TP/Crossing
2020-01-04 12:07:59 -05:00
Liru Færs
6d776632a9
Fix incorrect Link number in build floater.
2020-01-04 09:39:11 -05:00
Liru Færs
1853500e10
Fix Crash A: mFolders was being used without a null check
2020-01-04 02:57:40 -05:00
Liru Færs
8e01fcb7f0
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
2020-01-02 01:55:02 -05:00
Liru Færs
3cddb0df2e
Fix Crashes 1 and 5: LLTextEditor::replaceUrl, call to member
...
When a boost bind is converted into a suitable slot_function_type,
trackables will no longer be tracked, thus using ternary or static casts
breaks tracking, so old text editors were still receiving signals.
2020-01-01 21:35:07 -05:00
Liru Færs
37c4a4bbcb
Fix possible unlinked and bad looking names in general tab of build tools
2020-01-01 13:07:49 -05:00
Router Gray
af8f0e1155
Fix gcc error 'extra qualification on member'.
2020-01-01 06:53:08 -06:00
Liru Færs
5df00a481d
Code cleanup, now that erase is a member function
2020-01-01 02:59:52 -05:00
Liru Færs
d299c55ea4
Ve must erase ze kinderlach!!
...
Fixes Error 3, which was caused by deref of invalidated iterator
2020-01-01 02:59:23 -05:00
Liru Færs
d9d83a6807
Fix potential crash when SinguReplaceLinks is off.
2019-12-31 05:27:06 -05:00
Liru Færs
3fec94bb94
Clean up spell check entries properly, yikes.
...
Thanks for pointing this out, Torric!
2019-12-28 05:54:11 -05:00
Liru Færs
09926d12bb
Fix compile, again, oops.
2019-12-28 04:10:21 -05:00
Liru Færs
19bcdae6ac
LineEditor: Automatically hide spell check separator when it's not in use
...
That's the line that likes to linger beneath the menu, looking dumb
so now it won't, yay!
2019-12-28 04:09:35 -05:00
Liru Færs
36025384f4
Space change, remove excess check
2019-12-28 02:22:30 -05:00
Liru Færs
4bdbb89e6f
TODONE: create accessor methods for mItems
...
Adds LLMenuGL::end, LLMenuGL::getItems
Changes LLMenuGL::find to a const function returning a const_iterator
2019-12-28 01:43:01 -05:00
Liru Færs
e94314dc95
LLMenuGL::getItemCount should be const and return size_type
...
Also put it in the header.
2019-12-28 01:21:33 -05:00
Liru Færs
5dd68a4055
Actually make use of the item_list_t typedef
2019-12-28 00:31:45 -05:00
Liru Færs
fff4e9b4b8
Add optional name parameter to addSeparator
2019-12-28 00:23:46 -05:00
Liru Færs
8a6f5b49a3
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
2019-12-27 20:19:49 -05:00
Router Gray
c8290b913e
[CMake] Change remaining WORD_SIZE references to ADDDRESS_SIZE.
2019-12-27 06:16:59 -06:00
Liru Færs
e6e6d811c6
Updating crashpad
2019-12-25 21:33:51 -05:00
Router Gray
cdc35b3c32
[CMake] Remove add_dependency entries for items listed in target_link_libraries. Superfluous. (Alchemy sync)
...
Fixes Linux build errors.
2019-12-25 09:08:56 -06:00
Router Gray
c68e00730e
[CMake Linux] Only include pthread and rt in target_link_libraries for ld.gold support (Alchemy sync)
...
Fixes CMake warnings on Linux
2019-12-25 09:08:48 -06:00
Router Gray
0496374328
[CMake] Use POSITION_INDEPENDENT_CODE property instead of manually setting -fPIC (Alchemy sync)
2019-12-25 09:08:40 -06:00
Liru Færs
6608dd0b8d
Fix disabling crashpad and disable using crashpad on win32
...
Thanks Rye!
The Win32 build is a mess and won't have crash support for this release
We'll fix this all later
2019-12-24 05:33:12 -05:00
Liru Færs
432b4ab69d
Allow right clicking to navigate through notify tips that aren't gone
...
Also clean up logic, since we're now always handling right clicks
2019-12-22 21:56:59 -05:00
Liru Færs
967b3646a6
Allow complex user interaction with notify tips
...
Hover and active right click menu now maintain their presence
2019-12-22 21:35:53 -05:00
Liru Færs
4110d1975a
Give priority to a notify tip's children handling a left click
2019-12-22 21:16:07 -05:00
Liru Færs
b1862ce1c1
Shove textbox pointer of notifies into a member var
...
Used in future commit, separated for ease of reading
2019-12-22 21:14:14 -05:00
Liru Færs
a432c3429c
Mark notify stuffs final/override
2019-12-22 21:06:37 -05:00
Liru Færs
949190b48d
Clean up llnotify includes
2019-12-22 21:04:14 -05:00
Liru Færs
6885bf6368
Hack to get right click copy group name to work on my groups floater
2019-12-22 19:04:24 -05:00
Liru Færs
78f354925c
Tiny refactor, harmless
2019-12-22 18:35:59 -05:00
Liru Færs
a87b7603d1
Feature Request: Move Tiny Build Floater button to floater's top bar
2019-12-22 18:26:00 -05:00
Liru Færs
1f3a232a9d
Add Copy Name/Copy Names to avatar namelink menus
2019-12-22 01:44:06 -05:00
Liru Færs
99346d6486
This should've been committed in f3609b06d7
2019-12-21 04:58:57 -05:00
Liru Færs
067bd3cbd7
Sync with alchemy
...
Minor installer fix
Fix MSVC update breaking crashAndLoop
Move Variables to their corresponding places
Sync parts of deps/CMakeLists.txt
Update Abseil and fmt
2019-12-19 21:04:01 -05:00
Liru Færs
6e716fe3c5
Sentry and CI improvements from Rye.
2019-12-19 20:35:33 -05:00
Liru Færs
831c7f53b2
Fix bad spacing in Variables.cmake
2019-12-18 19:54:03 -05:00
Liru Færs
1c5a829e82
More of Rye's gitlab CI changes <3
2019-12-18 19:51:29 -05:00
Liru Færs
4751949628
Cleanup and further sync with upstream
2019-12-18 16:27:17 -05:00
Liru Færs
f8abafdefa
Code cleanup/sync
2019-12-18 00:05:59 -05:00
Liru Færs
4798d1e3b3
Finish migration from summary.json to build_data.json
2019-12-18 00:00:22 -05:00
Liru Færs
10140d143c
Wooops, branding ID separation is necessary, revert that change
...
Set up VIEWER_BINARY_NAME based on VIEWER_BRANDING_ID, make spaces dashes.
Fix VIEWER_EXE_GLOBS being wrong on Linux, thanks Router!
2019-12-17 23:49:37 -05:00
Liru Færs
f3609b06d7
Further CI/CD & building sync with alchemy
...
Reorder Variables.cmake for mergeability
Renames CMake Variables:
FMODSTUDIO->USE_FMODSTUDIO, NVAPI->USE_NVAPI,
VIEWER_CHANNEL_BASE->VIEWER_CHANNEL_TYPE
VIEWER_BRANDING_ID->VIEWER_BINARY_NAME,
VIEWER_PRODUCT_NAME->VIEWER_CHANNEL_BASE
Remove unused variables:
VIEWER_PACKAGE_ID, VIEWER_EXE_STRING, VIEWER_SHORTCUT_STRING, VERSION_BUILD
PACKAGE now defaults to on, USE_FMODSTUDIO now defaults to off
Use list append instead of set in some more places
Adds support for Project channels.
2019-12-17 19:31:08 -05:00
Router Gray
f25577649a
[BOM] Fix universal wearables more, and correctly: Sync WT_COUNT and WT_UNKNOWN constants in llinventory.cpp and llwearable.h
...
Reverted previous changes to textures.xml regarding this issue
2019-12-17 06:34:27 -06:00
Liru Færs
cf5586037e
Move to gitlab for CI (Rye's work but ported)
...
d3ddcdae: Update various urls from bitbucket to new alchemy gitlab
c24b176d: Standardize on one vc directory name for ease of build automation
Also add .gitlab-ci.yml
Thanks for the help, Rye!
2019-12-14 23:01:07 -05:00
Liru Færs
c6e3c31fae
Clean up logic
2019-12-12 20:21:14 -05:00
Router Gray
0c3e1f602a
[BOM] Fix universal wearables: sync a missed change from upstream, and make the inventory icon load.
2019-12-09 01:39:29 -06:00
Router Gray
d3a35e3f8d
Fix ancient bug in appearance editor
...
(ref viewer-release "MAINT-2564 FIXED Alpha mask does not hide hair in the Outfit Editor" and "MAINT-3399 Hairbase renders incorrectly in edit appearance mode")
2019-12-02 22:56:27 -06:00
Router Gray
b34bafc348
[UI] Make graphics preferences Object LOD value limit agree with QuickPrefs limit
2019-12-02 18:03:42 -06:00
Router Gray
cdb316834a
Exclude animesh from the AlwaysRenderFriends (and self) complexity exemptions.
2019-12-02 18:03:17 -06:00
Liru Færs
8b30e2e931
Also groups list for EAM panel
2019-11-24 08:04:34 -05:00
Liru Færs
841bd0e515
Add Group menus to group search, profiles, and groups floater
...
Also expand Group SLURL menu items for links in chat
Calculate ID Type from mPopupMenu's presence in sMenus, if possible.
2019-11-24 07:53:36 -05:00
Liru Færs
90677188ec
Fix Minimap menu not working
2019-11-24 06:28:49 -05:00
Liru Færs
6d5df7c9af
Make TextEditor an IDBearer, via slurl segments!
2019-11-24 06:03:46 -05:00
Liru Færs
79e1830ba9
Fix compile
2019-11-24 02:54:23 -05:00
Liru Færs
f0db784b46
Oh, this change is needed for the future.
2019-11-24 00:42:42 -05:00
Liru Færs
ef5c9f0175
Make sure that when we open pictures they stay on screen
2019-11-24 00:33:50 -05:00
Liru Færs
84081286f0
Buncha assorted changes
2019-11-24 00:32:58 -05:00
Liru Færs
1b913443ad
Add in menus for groups, and rework LFIDBearer to handle its menus
...
Also allow List.StartIM for multiselect
Add IsInGroup, NotInGroup, Leave, Join, and Activate "List." menu options
2019-11-24 00:27:19 -05:00
Liru Færs
f5c19b9e5c
Add List.EnableUnmute and List.CopyNames to menu callbacks
2019-11-23 23:07:13 -05:00
Liru Færs
5a561e03b8
Introduce Types for ID Bearer IDs
2019-11-23 23:05:33 -05:00
Liru Færs
ab207727fd
Buncha loopy changes
2019-11-23 22:44:35 -05:00
Liru Færs
b3231883f6
Remove unused menu_url_agent_mini.xml
2019-11-23 22:38:08 -05:00
Liru Færs
d9ff42ab3c
Add name_system attribute to NameBoxes and NameEditors
...
Uses the main one by default.
Removes old show complete names on profile setting in favor of
ProfileNameSystem, which is now offered under Adv. Chat->Chat UI
Forces nameui to refresh on name setting update, or should, not important though
2019-11-23 22:37:50 -05:00
Liru Færs
fb20751330
Create LFIDBearer default virtual functions for IDs and counts for 0/1 ID
2019-11-17 22:42:53 -05:00
Liru Færs
c5bf72f0b3
Merge NameBox initialization up to NameEditor's initialization
2019-11-17 22:34:44 -05:00
Liru Færs
cfdcb8b3df
Some finals
2019-11-17 22:33:03 -05:00
Liru Færs
7d0cbf6d02
Add a tiny hack to support <nolink> tag
2019-11-16 15:46:36 -05:00
Liru Færs
0b4f576c54
Touch up merge for llurlentry
2019-11-16 15:36:11 -05:00
Liru Færs
d93bed216a
Fix careless mistake breaking item properties floater
2019-11-16 12:34:36 -05:00
Liru Færs
89abfe6f86
Fix group names on certain group profiles sometimes never Loading in
2019-11-16 11:17:42 -05:00
Liru Færs
78fbc214ca
Make chat loaded from log file be in LogChatColor instead of hardcoded grey
2019-11-16 10:02:01 -05:00
Liru Færs
fc649854ff
Add Selected Avatars submenu to minimap menu
...
Minimap refactor, make it an LFIDBearer!
Moves listeners to cpp file, no need for header exposure
Removes duplicate ToggleControl listener just for minimap
Removes excess code from ToggleOverlay, we can use two on_clicks instead
Caches direction labels instead of looking them up each frame
Removes weird userdata look up on camera center menu item, fixing it
Respect RLVa by hiding the submenu, shortcutting lookups per child
2019-11-16 09:14:19 -05:00
Liru Færs
60e71f5724
Fix Beware's issue with SinguReplaceLinks failing for system messages
...
Fixes Teleport Offers in local being links
Fixes System Messages in IMs not enforcing link replacement
Fixes IM Chat History being loaded with replacement support,
at the log point, we can only consider it text from an outside source.
Changes IM Chat History color from hard coded grey to SystemChatColor
2019-11-16 03:49:47 -05:00
Liru Færs
b78807e5ed
Merge llnameui changes from future branch to use lighter rlv headers
2019-11-07 13:55:07 -05:00
Liru Færs
4e39027958
Fix Linux build, thanks Router~
2019-11-07 13:23:50 -05:00
Liru Færs
b527918350
Shorten format string
2019-11-07 12:47:59 -05:00
Liru Færs
16a352c70a
Fix Bridge Autodetach yet again, thanks for the report Beware!
2019-11-07 12:30:11 -05:00
Liru Færs
5035f9c3d6
Fix Track item in slurl menus being broken
2019-11-07 11:33:27 -05:00
Liru Færs
a662318417
We must download LibVLC during installation
2019-11-07 09:24:14 -05:00
Liru Færs
573934e505
Disable Breakpad symbol generation, not needed for crashpad
2019-11-07 06:30:37 -05:00
Liru Færs
927e86bdc9
Feature Request: Link names in transaction messages
2019-11-06 06:42:45 -05:00
Liru Færs
cfa2c4e424
Fix Beware's issue with SinguReplaceLinks being partially broken recently
2019-11-06 06:42:13 -05:00
Shyotl
79bafbb943
Merge remote-tracking branch 'singularity-viewer/master'
2019-11-05 21:50:08 -06:00
Shyotl
36bfaf0f05
Clean up appearance editor.
2019-11-05 21:48:12 -06:00
Liru Færs
3d7da6e858
Router's fix for manifest borkage, thankies!
2019-11-03 18:40:41 -05:00
Liru Færs
f81f374ab9
Fix name ui hover handling bypassing necessary base call. Woops.
2019-11-03 18:33:03 -05:00
Liru Færs
82050a5e46
Woops, actually do the script debug link thing.
2019-11-03 18:30:00 -05:00
Liru Færs
9cf26e1fc2
Link names! Online/Offline notifications, Make group item declines better
2019-11-03 16:17:32 -05:00
Liru Færs
fa869f21ad
Script Debug should link to object, when possible
2019-11-03 16:08:43 -05:00
Liru Færs
6af65004a5
Don't const_cast LLChat, just accept it as non-const.
2019-11-03 15:36:58 -05:00
Liru Færs
d189aadd12
Squeak
...
Links for teleport offers, show autoresponded with item to muted in local,
autounmute notification (so you can remute easily :P).
Cleanup redundant strings
2019-11-03 15:12:05 -05:00
Liru Færs
6048019926
When giving inventory to someone, use preferred name and link it in log.
2019-11-03 12:39:28 -05:00
Liru Færs
021ba21b4f
Fix Show/Hide spell check clutter
...
This patch is needed until the future where we discard menus on close
2019-10-30 00:32:21 -04:00
Liru Færs
96b7612d73
EAM Dates now respect ShortDateFormat
2019-10-26 15:17:40 -04:00
Router Gray
7e8ebdb852
[UI] Let clickable link name boxes and name editors have hand cursors instead of I-beams.
2019-10-24 22:49:06 -04:00
Router Gray
2e52fe64b8
[UI] Make avatar profiles honor ShortDateFormat. Thanks Liru.
...
Feature request/improvement suggested by Torric Rodas.
2019-10-24 22:49:06 -04:00
Router Gray
8b367c8eab
Fix a missed variable replacement in the debug settings merge.
2019-10-24 22:49:06 -04:00
Router Gray
68481b8921
[Notifications] Make cpp agree with xml to fix Restore In World confirmation on no-copy inventory items.
...
Thanks Torric Rodas for reporting.
2019-10-24 22:49:06 -04:00
Liru Færs
a5aeac312c
Merge debug settings against my updated alchemy version, gain tooltips!
2019-10-24 00:25:58 -04:00
Router Gray
d29d35ab23
Typo fix in autobuild xml.
2019-10-22 20:37:05 -05:00
Liru Færs
20eb6a3eca
Hide http disablers on SL, UDP doesn't work anymore so they do nothing
2019-10-22 21:26:19 -04:00
Liru Færs
54c4b1de83
Fix the common crash, not quite sure why LL doesn't get this one
...
This fix does a few things:
1. LLMaterialID initializing an LLSD implicitly from a uuid and
thus not having it be a Binary, and not overriding LLSD::asBinary,
UUIDs are now checked for when receiving an LLSD in constructor
2. Implicitly using a UUID shortcuts to just calling set with the mData.
2019-10-22 21:00:17 -04:00
Liru Færs
d3572dd4ec
Fix silly warning
2019-10-22 19:23:35 -04:00
Liru Færs
696a5f967d
Forgot to rip this out of the headers for nonwindows, woops
2019-10-22 17:45:54 -04:00
Liru Færs
3fa4f73b6f
Fix linux build, for the millionth time... is there a record?
...
Thanks for the help, damian
2019-10-22 01:55:06 -04:00
Liru Færs
afbafbe689
Merge branch 'master' of https://github.com/RouterGray/SingularityViewer
...
# Conflicts:
# indra/newview/CMakeLists.txt
2019-10-22 01:03:45 -04:00
Liru Færs
18b02594cb
Only have texture picker handle clicks with cb if on a visible portion
...
Fixes the bug wherein clicking the top of the a profile's groups list
would open that avatar's picture
2019-10-22 00:52:04 -04:00
Liru Færs
8288de7f79
Add Selected Face: display to build floater
2019-10-22 00:49:29 -04:00
Liru Færs
1693c97924
Add translatability to Selected prims/objects and Link number text
...
Also clean up this area's code a bit.
2019-10-22 00:49:15 -04:00
Router Gray
e3d69b4d8e
[Audio] Make Fmod cooperate with the new PCH shiny. Also fixes OpenAL in Windows.
2019-10-21 20:23:55 -05:00
Liru Færs
f8eef33b7b
This is fixes the build, woops
2019-10-21 17:31:28 -04:00
Liru Færs
d5af2588bc
Let combo box label be default selection via xui
2019-10-21 16:48:14 -04:00
Liru Færs
432bf03f0a
Port Crashpad support from alchemy, with some small tweaks
...
Moved initCrashReporting into LLAppViewer, everything we use there is
crossplatform enough that duplicating code is silly
Removes unused gCrashSettings
Adds MBFatalError, that's right, Crash Loop is now translatable!
Adds consent notification prompt to first login... enjoy that, everyone.
2019-10-21 16:25:29 -04:00
Router Gray
2ba3ff852c
[Linux] Switch to Ninja build system. Use compiler feature detection to accomodate the new PCH module.
2019-10-20 22:15:09 -05:00
Router Gray
76e9d912d6
[Linux] Drop prebuilt freetype and fontconfig, use system libraries.
2019-10-20 22:15:03 -05:00
Router Gray
29e71bec86
[CMake] The COMMENT directive needs quotes on output.
2019-10-20 22:14:57 -05:00
Router Gray
1d1857e5a7
[LL] Null checks, and demote a LL_ERRS to LL_WARNS.
2019-10-20 22:14:50 -05:00
Liru Færs
8a2407ecbb
fmt, just not for linux
2019-10-20 05:54:05 -04:00
Liru Færs
05146faacf
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2019-10-20 01:49:28 -04:00
Liru Færs
b7fb8fb0ca
Restore intentional removal of mGroupName caching
...
This field rarely changes, once if ever, as far as I can see...
perhaps we shoulld reduce the amount of setValue calls it receives but
they're not hurting too much for now.
2019-10-20 01:49:09 -04:00
Liru Færs
5ddab7d3b2
Feature Request: Link name in "Autoresponded to <name>" text
2019-10-20 01:37:28 -04:00
Liru Færs
ebcbf79237
Rearranging and cleaning up some assorted code
2019-10-20 01:36:41 -04:00
Liru Færs
f5fd05a1e4
Remove unused gPopupMenuView and MENU_BAR_WIDTH and other associated code
2019-10-20 01:32:56 -04:00
Liru Færs
a644b2dee5
Let's let gesture triggers and replacements be 128 characters, why not?
2019-10-20 01:20:20 -04:00
Liru Færs
1d073cd0d9
[BOM] Add a checkbox for Universal wearables to Create New Outfit floater
2019-10-20 01:18:20 -04:00
Liru Færs
a1e74c3286
MakeOutfitDialog should use deltas for xui
2019-10-20 01:17:40 -04:00
Liru Færs
a6cc7eda61
This has been unstaged for too long by accident
2019-10-20 01:15:06 -04:00
Shyotl
a36e128e57
Re-enabling NSIS invocation (???)
2019-10-19 18:41:18 -05:00
Liru Færs
daffb602bb
Clean up a bunch of spelling suggestion code that's annoyed me forever
2019-10-19 08:24:33 -04:00
Liru Færs
0f28a1bd86
These are things, I'm sleepy
2019-10-19 07:24:30 -04:00
Shyotl
4043130f75
Update texturelist/volumetexture management with changes from upstream. Note: TEX_LIST_SCALE not utilized in singu... yet.
2019-10-19 04:05:34 -05:00
Shyotl
835083a741
Added a few missing BoM pieces.
2019-10-19 04:00:51 -05:00
Shyotl
daf63eb418
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2019-10-19 00:01:59 -05:00
Shyotl
4d5e5e1635
Merge branch 'animesh' of https://github.com/singularity-viewer/SingularityViewer.git into animesh
2019-10-19 00:00:50 -05:00
Shyotl
15c3ff0544
Minor bits and bobs from upstream.
2019-10-18 23:59:41 -05:00
Router Gray
68d19cd6fb
[BOM] More BoM hooking up.
2019-10-18 16:16:16 -05:00
Liru Færs
ecc1730912
GCC 4 is why we can't have nice things... yet
2019-10-18 15:14:05 -04:00
Liru Færs
9c2d062886
Finish up ninja support, thanks Rye!
2019-10-17 23:04:21 -04:00
Liru Færs
7b3c3b9fab
Burst Commit for building with ninja and more, thanks Alchemy!
...
GeneratePrecompiledHeader - Cinder and Rye
Ninja Support - Rye
Fetch Content instead of prebuilds - Rye
Visual Studio Native CMake Support - Rye
2019-10-17 21:15:30 -04:00
Liru Færs
a37299b4ae
Cinder's randumb startup messages
2019-10-17 18:41:39 -04:00
Liru Færs
0c2ec8cb71
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2019-10-17 18:32:48 -04:00
Router Gray
7c2af68e3c
[BOM] Add the magic BoM defines to isFullyBaked() and applyParsedAppearanceMessage().
2019-10-17 03:48:53 -05:00
Damian Zhaoying
c0ec1d2c9a
New spanish translations for BoM
2019-10-15 08:03:07 -03:00
Liru Færs
28911f03a7
Harmless change that is more right to do than not
2019-10-14 22:13:15 -04:00
Liru Færs
c65b0eb544
Silence these noisy Customize Appearance debugs
2019-10-14 22:12:44 -04:00
Liru Færs
f11eb17313
Woops, forgot partway through why I'd made this early change, needed!
2019-10-14 22:10:29 -04:00
Liru Færs
453386a49a
Prevent warnings about missing ui from places it would never be
...
Layer interaction buttons for single layer wearable types
Buttons for subparts in types with only a single subpart
Take Off button for body parts
2019-10-14 22:05:53 -04:00
Liru Færs
accd69386a
Small opt for null ids on name lists
2019-10-14 22:00:25 -04:00
Liru Færs
610d592f5a
Let's do participants lists treating them as actual name lists
...
Adding items to these lists should be somewhat faster now, and that's good
because we usually add a bunch at a time with large groups.
2019-10-14 22:00:04 -04:00
Liru Færs
2b955eb00d
Fix the participate lists loading usernames as images bug
2019-10-14 21:56:14 -04:00
Liru Færs
f38d200e93
Fix estate's access panel having an opaque background
2019-10-14 21:55:03 -04:00
Liru Færs
0b1f605bba
Fix missing word and words going off the edge of customize info text
2019-10-14 21:54:17 -04:00
Liru Færs
278b617290
[BOM] Add Universal wearables functionality
2019-10-14 21:53:01 -04:00
Liru Færs
27c259bf7c
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2019-10-13 05:23:59 -04:00
Liru Færs
f520251935
Seriously, don't rush things when an Uber is coming
...
Fixes optional behavior to disable left click for profiles in name editors via xui not working because it wasn't listening to the variable passed in, woops. Yay randomly initialized pods!
2019-10-13 04:48:55 -04:00
Liru Færs
aa888c704e
Fix bug noticed by gcc noticed by router
2019-10-13 04:16:08 -04:00
Liru Færs
bbd3cb3469
Fix compile
2019-10-11 16:44:59 -04:00
Liru Færs
bd2c67e8ec
Fix win32 warnings
2019-10-11 16:28:48 -04:00
Liru Færs
b5afce0bbd
Add flag to enable line editor style left clicks on name editors
...
Enable this flag on the profile name editor, but not the partner one.
2019-10-11 15:38:38 -04:00
Liru Færs
c5f714def8
Fix build on Linux
...
Thanks for the heads up and testing, Damian
2019-10-11 14:40:38 -04:00
Liru Færs
fdeb194d0e
Fix Creator and Last Owner not showing in edit tools
...
Also fix special cases where there are owners that are not a single user
2019-10-11 05:33:54 -04:00
Liru Færs
975f3b420e
Woops, don't be so tired or you'll miss silly things...
...
or be super tired and see everything.
This fixes right click name editor logic causing constant menu swaps
every right click, but hey, at least we know that works, right?
2019-10-11 04:55:10 -04:00
Liru Færs
8d5f1191dd
Fix Windlight Editor not updating to current windlight's colors
...
This bug came whenever the color swatches were switched to sliders,
that's a long while ago! Eep!
2019-10-11 04:13:53 -04:00
Liru Færs
7c89a8b178
Remove old pointless code
...
Somehow fixed my BOM crash
2019-10-11 03:42:20 -04:00
Liru Færs
7c24e67c50
The UI portion of Bakes on Mesh... and the entire thing, sure, why not?
...
Also let's now select the proper tab when we input an ID or select a face
with an asset ID that we can find in a tab, but that never works for BOM
when applied.
2019-10-11 03:41:42 -04:00
Liru Færs
1cb9ea16da
Unlimit the width of a bunch of the name_boxes
2019-10-10 20:28:20 -04:00
Liru Færs
c4a9532784
Feature Request: Option to render only self: AlwaysRenderFriends set to 3
2019-10-10 19:40:01 -04:00
Liru Færs
43163b400d
Add support for a bunch of v3isms to scroll list xml parsing
2019-10-10 18:57:42 -04:00
Liru Færs
93e30f44c0
Woops, this looks like it should have been staged a while back
2019-10-10 18:56:57 -04:00
Liru Færs
b6b44a2c86
Texture Picker redesign, more room, better presentation <3
2019-10-10 18:55:44 -04:00
Liru Færs
cb53a4f923
Rename local texture picker tab to Local, Computer is so old school
2019-10-10 15:22:35 -04:00
Liru Færs
85f147f679
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into animesh
2019-10-10 15:09:43 -04:00
Liru Færs
17cb8bd764
Clean up and update all the translations where name ui was switched to
...
vim macros are powerful
2019-10-10 14:42:01 -04:00
Liru Færs
b2eb4ea70c
Remove now redundant partner profile button
2019-10-10 13:14:52 -04:00
Liru Færs
c6089637e7
On second thought, clicking a name editor should open up the profile, too
...
The initial thinking behind this decision was that people may want to
select, if they do, they can right click for this very rare use case.
2019-10-10 12:37:47 -04:00
Liru Færs
2f72ed2e80
Revert addition of now unused LLLineEditor::mFontStyle
2019-10-10 11:41:58 -04:00
Liru Færs
7b6a4d76a8
Actually, we don't underline links, I forgot, oops!
2019-10-10 11:39:59 -04:00
Liru Færs
8c7e498861
Some opts to avoid things that won't happen
2019-10-10 11:34:40 -04:00
Liru Færs
9824cc7068
Display Name UIs as links when they can be interacted with
...
Adds font style member to line editors, might be useful in the future?
2019-10-10 03:31:31 -04:00
Liru Færs
d16ff5cb5c
Bunch of excess clean up from while I was working on things
2019-10-10 02:49:17 -04:00
Liru Færs
0409a81e36
Renable old feature: Display complete names on profiles
2019-10-10 02:48:30 -04:00
Liru Færs
e0883b72dc
All Name UI now uses the user's NameSystem selection instead of legacy
2019-10-10 02:43:02 -04:00
Liru Færs
b592b3c658
Fix whoopses from mid-development commits
...
Fixes compiles and fixes menu crash and missing menu file
2019-10-10 02:39:11 -04:00
Liru Færs
d277f1750d
All places just av/group names were being used are now name ui
...
Since NameBoxes are clickable, remove redundant profile buttons.
Removes a ton of RLV logic, now centralized inside LLNameUI
Removes excess functions that went largely unused
May no longer show if parcel sale is pending under the owner field,
this is weird and it's hard to keep this behavior
Also includes the missing setValue and getValue so this compiles,
that should've been committed way earlier, oops
Also adds ability for name_box to have is_group attribute, too!
2019-10-10 02:32:47 -04:00
Liru Færs
d54bf78c08
Allow Name UI to be marked rlv_sensitive (via xui)
...
This allows these parts of UI to be hidden when they need to be
2019-10-09 20:47:21 -04:00
Liru Færs
b1be8bb7f3
Clean up a section of RLVa code
2019-10-09 20:13:16 -04:00
Liru Færs
0b7061afb7
Name UI flag to disallow user interaction
...
Also bypass setting name text for null ID
2019-10-09 20:07:29 -04:00
Liru Færs
b132578692
Bit of refactor in prep for bigger changes
2019-10-09 20:03:26 -04:00
Liru Færs
c18bdddb60
Woops, forgot to stage this file!
2019-10-09 17:57:10 -04:00
Liru Færs
6cd07b23f1
Name Editors sometimes need to be scrolled through, show tooltip instead
2019-10-09 17:44:31 -04:00
Liru Færs
ab546f54ab
Remove unnecessary function
2019-10-09 17:43:26 -04:00
Liru Færs
11068eee38
Woops, these are needed since the change of name to line editor
2019-10-09 17:42:22 -04:00
Liru Færs
f80e23ac5e
Name Editors are Name UI too!
2019-10-09 17:30:27 -04:00
Liru Færs
513a4fd16c
When a profile is being reused, disable partner info button
2019-10-09 17:23:41 -04:00
Liru Færs
98b3c8a812
These are not name editors, they are line editors. Get it right.
2019-10-09 17:22:31 -04:00
Liru Færs
f5ffa65ea7
Merge Line Editor menu and Text Editor menu, and use EditMenu listeners
...
Cleans up a ton of logic and some excess memory usage
Translates Line Editor menu, finally
2019-10-09 17:12:10 -04:00
Rye Mutt
a559a09217
Fix a ton of small bugs in 64bit memory value handling
2019-10-09 16:52:46 -04:00
Liru Færs
3cb831bb56
Add the Photo Tools Windlights from FS, thanks FS/original authors
2019-10-09 15:52:12 -04:00
Liru Færs
bce8a3b3cc
Add extending existing xml menus by using filename attribute
2019-10-09 15:36:36 -04:00
Liru Færs
65ee3a5345
Move duplicated logic out of NameBox and into new base class LLNameUI
...
Also clean up includes.
2019-10-09 01:34:00 -04:00
Liru Færs
3c8a8efc03
Merge branch 'animesh' of https://github.com/singularity-viewer/SingularityViewer into animesh
2019-10-07 23:59:45 -04:00
Liru Færs
99facf6764
Make namebox an IDBearer, so now it has a right click menu, yay!
2019-10-07 23:47:35 -04:00
Liru Færs
8f3b10875e
Introduce LFIDBearer, a Class for menu bearing UI that offers IDs to menus
...
Move menu code from scroll list into there
Separate out interface for getting IDs
No longer bother with the focus manager, for menus where not necessary,
this ensures that if focus suddenly changes, it won't break menu UX flow.
Clean up all the static functions by using new static class functions
2019-10-07 23:46:09 -04:00
Liru Færs
33ef6cc3f7
Initial alteration of namebox for clicky stuffs
...
Should allow left clicking of certain name textboxes to bring up profiles
Removes old dead variables
Cleans up includes
2019-10-07 23:38:34 -04:00
Rye Mutt
bcadee8575
Apply a lil alchemy blackmagic
2019-10-07 12:40:30 -04:00
Rye Mutt
77f8855fd6
Swap to absl hash maps on two extremely hot paths
2019-10-07 12:07:00 -04:00
Rye Mutt
b4243dc95b
Enable larger resolution media surfaces for ultrawide monitors
2019-10-07 12:06:42 -04:00
Rye Mutt
2f4d254bc6
Fix calling cmake -E to use proper cmake var
2019-10-07 12:03:15 -04:00
Rye Mutt
e98e9391bf
Ignore pip lockfile
2019-10-07 11:57:39 -04:00
Rye Mutt
e1757d68a5
Enable cmake IDE folder generation
2019-10-07 11:56:46 -04:00
Rye Mutt
a46f1145f5
Properly disable WER reporting
2019-10-07 11:56:31 -04:00
Liru Færs
d21e5db701
Fix the group founder name
2019-10-05 01:54:06 -04:00
Shyotl
1c1e64f48f
Merge branch 'animesh' of https://github.com/singularity-viewer/SingularityViewer.git into animesh
2019-09-29 19:29:28 -05:00
Shyotl
4b6d1934c3
Clear out VAOs properly.
2019-09-29 19:29:03 -05:00
Rye Mutt
8561af1f84
Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion
2019-09-28 19:03:49 -04:00
Rye Mutt
0880c762c9
Update nvapi to new location
2019-09-26 20:35:43 -04:00
Rye Mutt
886619a099
Add files needed for python venv
2019-09-26 20:11:43 -04:00
Liru Færs
64f4df5005
scroll_list -> name_list in translations
2019-09-11 15:21:10 -04:00
Damian Zhaoying
fd5e9fa85f
Update spanish translations - Avatar menu
2019-09-10 01:57:08 -03:00
Damian Zhaoying
6a0506386d
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-09-09 14:52:48 -03:00
Liru Færs
c5787381aa
Fix up inactive translations to have the new submenus translated
2019-09-09 13:11:13 -04:00
Damian Zhaoying
22ed61f69c
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-09-09 13:19:33 -03:00
Liru Færs
f6e204e4fb
Merge branch 'animesh' of https://github.com/DamianZhaoying/SingularityViewer into animesh
2019-09-09 12:14:55 -04:00
Liru Færs
6f5abf105d
Fix PT translation graphics reset button overlap
2019-09-09 12:05:30 -04:00
Liru Færs
8106a949bd
Actually show tooltip for account info on profile
2019-09-07 18:02:05 -04:00
Liru Færs
497012f98e
Clean up focused UI menu code and opt out a common dynamic_cast
...
Initially I null checked this in testing and debugging, and since
then this code has just lowered performance, ugh.
2019-09-07 13:36:08 -04:00
Liru Færs
46f57756e7
Fix invalid TimestampFormat being generated by custom/old date setting
...
New Behaviors:
If you have a custom date setting, your TimestampFormat will not be set
(you'll need to set it yourself).
If you have a custom time setting and not a custom date setting, your
TimestampFormat will end with your ShortTimeFormat.
2019-09-07 12:26:09 -04:00
Damian Zhaoying
6a6f3d61bb
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-09-02 13:45:53 -03:00
Damian Zhaoying
956af9177e
Update Spanish Translations
2019-08-30 18:55:58 -03:00
Liru Færs
f2d1c820f5
Update FMODStudio for more platforms, yay!~
2019-08-30 16:58:57 -04:00
Liru Færs
5999998ead
On second thought, let's reorganize that menu to be more chat oriented
...
Send IM should be exposed top level
Profile should be inside the submenu
The submenu should be called Actions
2019-08-30 15:56:12 -04:00
Liru Færs
293820747f
Add the Avatar submenu to the agent menus and create parity between them
...
A little mouse hover to open a submenu is better than an unwieldy menu
Moves Focus into the avatar section
2019-08-30 15:39:23 -04:00
Liru Færs
4b97f76aa7
Make the right click avatar slurl menu as good as the list ones
2019-08-30 15:24:05 -04:00
Liru Færs
2e465ba04a
Improve List menu with IsNearby check
...
Teleport To is now available whenever a user is nearby, regardless of list
The local avs menu's Moderation submenu, Focus, and Track/Untrack has been
adopted into the main avs list menu making the only difference submenuing
Fix track/untrack not working, since it requires the radar to work right
2019-08-29 17:45:55 -04:00
Liru Færs
7c367d4e9c
Participant Lists should be name_lists
2019-08-29 13:38:21 -04:00
Liru Færs
773ee898f7
Update fmodstudio
2019-08-29 13:32:23 -04:00
Liru Færs
8b85b9b06b
Add Copy Page URL to media right click menu
2019-08-26 09:00:32 -04:00
Liru Færs
7c092411b0
Fix the scrollbar being missing on the estate access lists
...
Also make the access tab more beautiful overall
2019-08-26 08:59:37 -04:00
Liru Færs
e237c02295
Sometimes account into is too long to display on profiles, show tooltip
2019-08-26 08:38:22 -04:00
Liru Færs
4b36cd4a58
[OpenSim] Sometimes we are given invalid born strings, don't crash!
2019-08-26 08:36:11 -04:00
Liru Færs
a20f4450e9
Revert "update sources"
...
This reverts commit ce4b35ba1a .
2019-08-25 17:24:02 -04:00
Liru Færs
bc99ceee12
Merge branch 'animesh' of https://github.com/RouterGray/SingularityViewer into animesh
2019-08-25 17:21:56 -04:00
Liru Færs
2c3e37024e
A Name List that's double clicked should open a profile
...
Unless other behavior already exists, name lists aren't all scroll lists,
void where prohibited, other restrictions may apply.
2019-08-25 17:02:48 -04:00
Liru Færs
a399bd7b62
Rework Name List Items to store the name type fully
...
It's more proper this way, but this will create some merge fighting
2019-08-25 15:51:29 -04:00
Router Gray
c90c303fd4
[Linux] Fix 'error: invalid initialization of non-const reference'.
2019-08-20 21:05:50 -05:00
Liru Færs
29236442de
A scroll list doesn't always handle double clicks
2019-08-18 17:27:52 -04:00
Liru Færs
b93f4fa879
Do hitItem opted like drawItems, and be able to click on item slivers
2019-08-18 17:08:00 -04:00
Liru Færs
971083415c
This should fix Nai's issue, maybe?
2019-08-18 16:20:26 -04:00
Liru Færs
a1a23cf6c5
At least draw the hidden item... I'll fix this later
2019-08-18 03:33:15 -04:00
Liru Færs
51974891a8
Harmless change
2019-08-18 03:32:37 -04:00
Liru Færs
7670094e7d
Rearrange these to where they're needed, and opt draw more
2019-08-18 02:07:37 -04:00
Liru Færs
69addc1d52
Use Cached Control during draw call
2019-08-18 01:33:42 -04:00
Liru Færs
ab4e0127c5
Further optimize LLScrollListCtrl::setFilter for contracted filter cases
2019-08-18 01:22:02 -04:00
Liru Færs
ba9e7d8056
Fix filtering scrolllist scrollies
...
filterItem now returns a bool whether or not the item was filtered.
2019-08-18 01:13:26 -04:00
Liru Færs
878b200217
Don't bother updating scroll list scrollbar rect when invisible
2019-08-17 23:54:30 -04:00
Liru Færs
1ffa9f7c0c
Fix and optimize redundant scroll list drawing logic
2019-08-17 23:52:43 -04:00
Liru Færs
d46b8f9963
Profile 2nd Life tab gets a much needed facelift
2019-08-17 21:54:42 -04:00
Liru Færs
1b52b3e685
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
...
# Conflicts:
# indra/llcommon/llindexedvector.h
2019-08-15 20:50:36 -04:00
Damian Zhaoying
5eef36c47a
More updates to spanish language
...
# Conflicts:
# indra/newview/skins/default/xui/es/floater_toolbar_prefs.xml
2019-08-15 20:45:38 -04:00
Shyotl
5c156a9d86
Added ll(Start/Stop)ObjectAnimation lsl function awareness
2019-08-11 20:37:00 -05:00
Shyotl
4f72de8289
Make gcc happy with closer to standards compliant code..
2019-08-10 01:16:37 -05:00
Shyotl
a9c165f8a4
These should be inline now that they arent member functions.
2019-08-09 23:49:16 -05:00
Shyotl
767bdc1a30
Make linux happier?
2019-08-08 13:48:13 -05:00
Shyotl
f09b828217
Use wgl shared context lists to avoid re-creating gl context from scratch.
2019-08-07 23:02:34 -05:00
Shyotl
d2b28f60ff
Speed up object param lookups.
2019-08-07 22:50:08 -05:00
Shyotl
21b1d5b52e
Hotspot elimination.
2019-08-07 21:21:36 -05:00
Router Gray
f61becccb3
[gpu table] Add AMD Radeon/Asus RX series.
2019-08-07 21:05:00 -05:00
Router Gray
0da6696e83
[gpu table] Make the AMD Vega wildcard wilder. Add Nvidia RTX series cards.
...
Also banish the VE to near bottom of the AMD/ATI list
2019-08-07 11:47:18 -05:00
Shyotl
4091bf9da5
Template abuse to clean up llkeyframemotion. Only functional change: std::map<F32, curve> to std::vector<std::pair<F32, curve>>. Sorry in advance Linux.
2019-08-06 02:21:56 -05:00
Shyotl
da86dd08c4
Throttle avie complexity calculation frequency to once per 5s per avie.
2019-08-06 00:09:59 -05:00
Liru Færs
59a12dfe1d
Clean up some last few QuickTime things
2019-08-05 21:13:32 -04:00
bittenbythedark
468f28941f
Remove unneeded notifcations
2019-08-05 21:10:20 -04:00
bittenbythedark
a987bcac6f
Fix MP4 Playback on windows, alchesync
2019-08-05 21:08:13 -04:00
Liru Færs
782d71a745
This probably will fix the active voice list issue
2019-08-05 21:03:25 -04:00
Lirusaito
212bd47d36
Revert "This probably won't fix the active voice list issue"
...
This reverts commit 466f901105 .
2019-08-05 16:41:28 -04:00
Lirusaito
bcf301ce6a
Add Marketplace option to toolbar and add to world menu
...
Also hidden in this commit is the ability to add buttons/menu entries for
your favorite websites to be opened in the in-viewer browser
Just make a button that calls "ShowWebFloater" and passes the URL as param
2019-08-03 20:17:30 -04:00
Lirusaito
01b4f52fb0
Add support for better speakerlist for conferences
2019-08-02 20:30:15 -04:00
Lirusaito
2cc41405d2
Restore Access Management lists' sort orders after populating them
2019-08-02 20:09:11 -04:00
Lirusaito
37c6636788
A function to set scroll list sort order
...
Renames getSortColumns to getSortOrder
2019-08-02 20:05:58 -04:00
Lirusaito
80c24532ba
Remove excess getChilds from llfloaterland
2019-08-02 17:55:22 -04:00
Lirusaito
4702e3d586
Fix parcel access management
2019-08-01 22:27:29 -04:00
Lirusaito
466f901105
This probably won't fix the active voice list issue
2019-08-01 16:51:17 -04:00
Router Gray
ed4e91ee7f
[Linux] Cmake fix to not do manifest copy twice when packaging.
2019-08-01 08:48:57 -05:00
Router Gray
ee6f919ea7
[Linux] Properly detect full screen resolutions. Thx Laffalott reporting and Henri Beauchamp for code.
2019-08-01 08:48:15 -05:00
Lirusaito
9f84fe6d5a
Make it Squeak
2019-07-31 19:43:33 -04:00
Lirusaito
2580ca7afd
Fix paused frame overflow, thanks Rye!
2019-07-31 14:22:27 -04:00
bittenbythedark
aee0e75971
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-07-31 00:55:19 +02:00
bittenbythedark
ce4b35ba1a
update sources
2019-07-31 00:53:30 +02:00
Router Gray
dc77a053ea
[Alchemy sync] Switch from shipping vc_redist to shipping the dll's from the build host.
2019-07-29 23:04:26 -05:00
Router Gray
565153c5f7
Fix weird gesture deactivation and state-save bug with weird fix.
...
Also OCDly replace a NULL with nullptr (not part of the above fix).
2019-07-29 17:55:48 -05:00
Lirusaito
6aab72beb8
Remove iffy EAM change
2019-07-29 11:21:00 -04:00
Lirusaito
c8bd1f5f5b
Fix the duplicate squeaks
2019-07-26 21:17:02 -04:00
Lirusaito
5f2b3a10ff
X-Grid Protocol resolution support
2019-07-26 20:44:17 -04:00
Lirusaito
1466539d88
[Feature Request] Open Muted List Profiles via Double Click
2019-07-26 20:27:17 -04:00
Lirusaito
01b02fd6b1
We must prompt the user before giving them support the first time
2019-07-26 20:24:09 -04:00
Lirusaito
16a6af820a
Fix the duplicate squeaks
2019-07-26 19:09:36 -04:00
Lirusaito
ac7e5cb742
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-07-26 04:22:43 -04:00
Shyotl
2dbbec88f7
Fixed bug with LLStat median calculation. Clean up llstatbar a bit.
2019-07-25 23:43:04 -05:00
Shyotl
6dc9210a7e
Const is good. Use it for viewer stats.
2019-07-25 22:30:44 -05:00
Lirusaito
4a6031ba38
How did this happen?
2019-07-25 22:00:37 -04:00
Lirusaito
466cc0b98d
Chocolate must be really bad for me, I'm super dizzy and dazed...
2019-07-25 11:07:56 -04:00
Lirusaito
ed6dcb6a5b
More code cleanup to fix compile
2019-07-25 10:56:20 -04:00
Lirusaito
ec8d2646cd
Fix ancient dumb code breaking shiny modern features
...
Now if you have your date or time format set via debug settings,
they'll only be overwritten if you use the preferences UI for them
Be warned that the cancel button will not restore your custom formats
debug settings are nice to use, but you are an edge case power user
This commit cleans up a buncha duplicated code and makes it look nice and neat
Thanks to Router for making sure I wasn't crazy~
2019-07-25 10:35:50 -04:00
Router Gray
bca94dc4be
Fix linux64 dullahan link bc some browsers are so smart they're dumb. Thanks Tazy Scientist.
2019-07-24 21:15:37 -05:00
Router Gray
8e00ae1d44
Allow gstreamer plugin to compile on Gentoo et al. Thanks to Tazy Scientist.
2019-07-24 17:49:39 -05:00
Router Gray
99303883dc
Banish WIN_VSVER from not-Windows. Thanks Drake for dealing with my stubbornness.
2019-07-24 03:16:01 -05:00
Shyotl
ea2b1e179e
Removed unnecessary lighting assertions. Fixed compiler warning.
2019-07-23 20:49:17 -05:00
Lirusaito
bf10ab4bb1
Fix single line profile button for Group IMs started by others
2019-07-23 02:29:34 -04:00
Lirusaito
0f24c79ce9
Restore storage of list maximum column width
...
Fixes thin lists in comboboxes and flyout buttons
2019-07-23 02:07:40 -04:00
Lirusaito
c5ad7849ac
PathfindingDirty was dirty
2019-07-22 23:42:24 -04:00
Lirusaito
d66c730c30
Back down on overzealous list filter checking and explicitly default filter
...
For clarity to others in the future: getFiltered() checks are meant for
functions where the user is interacting the scroll list in some way
or we're displaying the scroll list.
2019-07-22 23:38:45 -04:00
Lirusaito
61730f3ee1
Commas, please
2019-07-22 10:33:11 -04:00
Lirusaito
1cc2933c32
Merge branch 'animesh' of https://github.com/RouterGray/SingularityViewer into animesh
2019-07-22 10:13:56 -04:00
Lirusaito
34b42cc5d7
TOS and Voice License stuff
2019-07-22 10:10:01 -04:00
Lirusaito
4cb43c6747
Add in an option for YYYY/MM/DD, for the classical log stampies
...
Cleanup that prefs code, too!
2019-07-22 10:09:14 -04:00
Lirusaito
189590edb9
Naaaaaaaa
2019-07-22 10:04:31 -04:00
Router Gray
c711847b4e
Don't crumble Liru's cookies (less spam in linux manifest)
2019-07-22 07:56:19 -05:00
Lirusaito
b3fcd87a20
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-07-22 08:52:10 -04:00
Lirusaito
3654ff5f5c
Fix up EAM to work (Part 2)
...
Did you know you could type into a list to search it by prefix?!
The Lindens didn't!!
Let's make this search bar an ACTUAL FILTER!
To do this, we add support for filtering to all scroll lists,
so that's cool. Also filtered items will be selected.
Also optimized item selection loop to perform better when selecting in
massive lists (like group members)
Changed the text on the Copy Button to reflect that it copies everything,
not just the applied filter... if you wanted that, you could just
ctrl-a, ctrl-c... I mean, reallly
2019-07-22 08:39:06 -04:00
Lirusaito
31c5b00fed
Fix up EAM to work (Part 1)
...
Move Copy button to bottom because NO ONE KNOWS HOW TO UI ANYMORE,
I am alone, so alone *single tear*
Don't draw headings on single column lists, it just wastes space
2019-07-22 08:36:11 -04:00
Router Gray
2484555854
Linux library updates: FMOD Studio 2.00.02, Dullahan.
2019-07-22 04:49:58 -05:00
Router Gray
9600965bcf
Dullahan finally works, thanks Liru, Bitten, Drake. Catch Linux up.
2019-07-22 04:48:34 -05:00
Shyotl
1bd6ba61a7
Improve vram detection on systems with multiple gpu devices.
2019-07-22 01:31:15 -05:00
Shyotl
899d09bfcc
Don't /actually/ run in true core context yet as people like to play with settings they don't understand.
2019-07-21 02:33:12 -05:00
Shyotl
35433cb8a4
Added tools->avatar tool submenu when rightclicking rigged mesh. Fixed 'reset skeleton and animations' on self pie menu not working.
2019-07-21 01:57:30 -05:00
Lirusaito
7d9642210d
Close on select before selection callback, if desired
2019-07-20 18:52:27 -04:00
Lirusaito
8126418ef3
Sync with upstream to kill dependent floaters appropriately
2019-07-20 18:43:10 -04:00
Lirusaito
d0a6772245
Merge in EAM from viewer-release
...
Remove the derpy stuff lindens like to do
Wide strings aren't normal strings
Make it all a bit better~
Redid the Duration floater because it was kinda icky,
gave it more flexibility~<3
Display parcel ban and access durations as dates instead of text, sortable!
Reworked the rather icky lookin' Access panel control ordering
Enabled lowering parcel ban time without needing to find and remove first
2019-07-20 18:27:47 -04:00
Lirusaito
3f921251ee
Add getAllIDs to LLScrollListCtrl, and make getSelectedIDs a little better
2019-07-18 20:09:47 -04:00
Lirusaito
cf94149dc1
Scroll List Dates need a default format
2019-07-18 18:55:05 -04:00
Lirusaito
74d26eac86
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-07-18 02:52:18 -04:00
Shyotl
225d174ec6
MIN_MEM_FOR_NON_TEXTURE setting doesn't work well with new math. Lower signifigantly.
2019-07-18 01:33:47 -05:00
Shyotl
3bc4d6fd63
Fix UI backgrounds vanishing when toggling basic shaders on and off.
2019-07-17 20:20:41 -05:00
Shyotl
94787c6da8
Quiet down harmless debug warnings on nVidia when using renderDebugGL.
2019-07-15 21:00:09 -05:00
Lirusaito
6d2b530330
Feature Request: Make the build number display check setting persist
2019-07-14 02:29:32 -04:00
Lirusaito
c2fbb6f10f
Fix single line group chat button positions
2019-07-14 02:12:03 -04:00
Router Gray
2f54cf26a9
Make gcc happy, silence 'changed meaning' warning.
2019-07-14 02:10:06 -04:00
Lirusaito
9945fc1767
Enable Abuse Report from P2P IM
2019-07-12 17:48:59 -04:00
Pytak
186cf58197
[PyFX] add new windlights and PPE presets from PyFX 0.7
2019-07-12 17:44:32 -04:00
Lirusaito
1c80ae45d8
Sync experience script stuff from future branch~
2019-07-11 00:38:53 -04:00
Lirusaito
2c992c3f16
This was broken, that's stupid
2019-07-10 23:55:07 -04:00
Lirusaito
e2f7a0ef5c
Let's nearly break logging to add a highly requested feature
...
My keyboard has been broken for almost half a year
and none of you will ever care
but I care about you
I care so much
2019-07-10 23:54:48 -04:00
Lirusaito
665df2fe4e
Feature request, allow keywords to trigger on system messages
2019-07-10 20:57:32 -04:00
Lirusaito
311020034e
Only render friends when AlwaysRenderFriends is set to 2
2019-07-10 20:50:44 -04:00
Lirusaito
564a9abf42
Enable left mouse menu support, part 1
2019-07-10 18:03:38 -04:00
Lirusaito
6a60fa3458
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-07-10 03:43:44 -04:00
Lirusaito
94cf62f510
Fix issue of Enter not reliably opening items
2019-07-10 03:33:05 -04:00
Lirusaito
1920f529be
Feature Request: Add Received Items to menu(under World)/toolbar
2019-07-10 03:32:33 -04:00
Shyotl
1234cf42e9
msg_blk_data_map_t mMemberBlocks must be ordered. Todo: convert to vector, as insertion order should be good enough with minor changes.
2019-07-10 01:37:00 -05:00
Shyotl
ed9307097b
Updated LLFloaterMessageLog
2019-07-10 01:16:40 -05:00
Shyotl
f16bde1ac8
No exceptions on unrecognized messages.
2019-07-10 01:06:21 -05:00
Shyotl
49b027f2a0
Rework llindexedvector to be a bit more debugable.
2019-07-10 01:05:42 -05:00
Lirusaito
ff2c0e52b4
Cleanup those menu entries, too, and make them checks as they should be
2019-07-10 00:01:21 -04:00
Lirusaito
8094d13c2e
Use type names instead of new category names for built in folder floaters
2019-07-09 23:52:38 -04:00
Shyotl
37839ff247
Fix broken 'create new outfit' checkboxes. Not sure when this broke.. (The checkboxes are wrongly lower-cased. Hack around it in code instead of breaking translations...)
2019-07-09 22:04:46 -05:00
Shyotl
e32b13e226
Disable old hack that was breaking ssl connections, as LL now uses TLS1.1.
2019-07-09 21:39:21 -05:00
Lirusaito
3a678f5a9b
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-07-04 12:39:47 -04:00
Lirusaito
b8cfb5c8be
Unbreak my Goat, Fix UDP again
2019-07-04 11:02:40 -04:00
Lirusaito
476721b4b9
Comment out unused variable
2019-07-04 11:01:39 -04:00
Lirusaito
b4a37bf20d
I finally got around to uploading the 32-bit windows dullahan package
2019-07-04 10:43:28 -04:00
Naiyako
4a6a81b5d4
Make fmod2.0 compiling
...
Signed-off-by: Lirusaito <inusaito@gmail.com >
Added libraries to autobuild, mac build from Bitten
2019-07-04 10:42:19 -04:00
Shyotl
d9392d5c39
fix cmake without vc redist. remove double to float warning.
2019-07-04 09:30:59 -05:00
Shyotl
279d919164
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh
2019-07-03 19:42:40 -05:00
Shyotl
9e47335f98
Revert raised cache cap. Actual impl is not in this branch. Also use actual unit types for cache size logic because it looks nicer.
2019-07-03 17:50:09 -05:00
Shyotl
43ab8a2e36
Do not attenuate specular map with diffuse map trasnparency.
2019-07-03 16:00:33 -05:00
Shyotl
b5cb6459b0
Tweak memory detection algorithm.
2019-07-03 16:00:16 -05:00
Shyotl
4622be4cef
Clear sim stats upon stats stat update in new region.
2019-07-03 15:59:51 -05:00
Lirusaito
b9e522fd8d
Hide Marketplace Listings folder from main inventory, it bugs filters
2019-07-02 22:47:37 -04:00
Lirusaito
71f2dee332
Yet more TOS Floater tweaks
2019-07-02 22:39:26 -04:00
Lirusaito
b86e402fc0
Remove now unused rectangle setting for opening in folders new floaters
2019-07-02 14:06:19 -04:00
Lirusaito
658be9bd58
Fully combine voice with tos stuffs
...
Removes separate voice license code
Cleans up tos code
2019-07-02 14:00:46 -04:00
Lirusaito
65df86e741
Integrate voice license code into floatertos
2019-07-02 13:12:46 -04:00
Lirusaito
0197a47007
Support modern event slurls
2019-07-01 20:31:09 -04:00
Lirusaito
ce42937e3f
Goats are as delicate as the UDP pipeline
2019-07-01 20:29:08 -04:00
Lirusaito
aec4278292
Unbreak the goat!
2019-06-30 18:25:27 -04:00
Lirusaito
8fef329437
Fix UB, thanks Router and Clang for the heads up
2019-06-29 21:23:07 -04:00
Lirusaito
128d30bd4b
Fix Compile
2019-06-16 03:57:04 -04:00
Lirusaito
7dea17cdc7
Fix Xitano's bug by fixing my viewer_manifest bootstrap paradox
2019-06-13 18:27:43 -04:00
Lirusaito
82386fe2ef
Negative TeleportHistoryMaxEntries means unlimited now
2019-06-10 09:15:35 -04:00
Lirusaito
c2f56f1881
Woops, now inventory floaters remember their position per folder for real!
2019-05-31 22:57:50 -04:00
Lirusaito
68fc758e94
Do not make installer package unless binary is updated (or touched)
...
This is bad for production,
adding a touch binary line to the prebuild step should fix it though
2019-05-31 19:35:22 -04:00
Lirusaito
1cd7706461
Actually updaate the binary we put into the installer
2019-05-31 18:22:56 -04:00
Lirusaito
2e5141bd25
Possible fix for Torric's gesture toggle crash
2019-05-27 06:25:29 -04:00
Router Gray
f6d8573221
"Liru: All getters should be const, ideally." Clang agrees.
...
The values being compared are const, the result should be too.
2019-05-24 12:06:35 -05:00
Router Gray
562982cc30
Null check, sooner is better, and clang is happy. Thanks Liru.
2019-05-24 12:06:34 -05:00
Router Gray
df13aa408b
Add missing operand in inventory actions.
2019-05-24 12:06:33 -05:00
Router Gray
4329d46ac4
Properly comment out code so compilers quit whining about 'unreachable'.
2019-05-24 12:06:33 -05:00
Router Gray
bf9e900731
Fix warning about variable promotion.
2019-05-24 12:06:32 -05:00
Router Gray
40ad9fad32
Fix fonts search path on not-Windows.
2019-05-24 12:06:32 -05:00
Router Gray
3951f6f516
Fix no newline at EOF.
2019-05-24 12:06:31 -05:00
Router Gray
58d94e9883
Change some instances of {0} to {} to pacify compilers.
2019-05-24 12:06:30 -05:00
Router Gray
55c0ba5b06
Silence compiler warning destructor on non-final w/virtual functions & non-virtual destructor
2019-05-24 05:57:15 -05:00
Router Gray
e327c5ad0e
Merge remote-tracking branch 'github-liru/animesh' into animesh
2019-05-23 11:48:22 -05:00
Lirusaito
bf176ffd4d
Prevent the texteditor from parsing highlights when it shouldn't
2019-05-11 22:49:56 -04:00
Lirusaito
6a7695a8f0
Refactor appendAndHighlightTextImpl's Highlight impl and fix selection
2019-05-11 22:40:17 -04:00
Lirusaito
4bb63a9827
Fix SinguReplaceLinks not being respected on various user driven UI
...
Corrects display for Readonly Notecards, Picks, Group profiles, First/
Second Life, Classifieds, Events, Landmarks, About Land, and Region/Estate
Thanks for giving me the heads-up, Beware
2019-05-10 18:47:06 -04:00
Lirusaito
2a40ca6295
LLTextEditor's setText and setWText shouldn't always enforce linking
2019-05-10 16:45:20 -04:00
Lirusaito
e9c99089e1
No viewer_manifest warnings, please.
2019-05-10 14:04:32 -04:00
Lirusaito
93af7491ee
Attempt at fixing beware's selection lost bug once and for all
2019-05-07 01:07:48 -04:00
Lirusaito
2075d92369
Fix crash when SinguReplaceLinks is false reported by Beware
2019-05-07 00:33:39 -04:00
Router Gray
9bcd3298ba
Use dictionaries prebuilt instead of in-tree; adds several languages.
2019-05-05 20:15:04 -04:00
Router Gray
2f9a43effd
Sync with Alchemy to fix and streamline Windows plugins packaging
2019-05-05 20:14:59 -04:00
Router Gray
535a01ea30
SLVoice update Windows and Mac
2019-05-05 20:14:53 -04:00
Lirusaito
1193f9bb65
Fix Torric's no copy texture crash
...
Thanks for the research and textures, Cheesy
2019-05-05 20:09:31 -04:00
Lirusaito
623b993fa9
Fix the inventory floater resize bug
...
Thanks for catching this, Deltek.
2019-05-05 18:52:00 -04:00
Lirusaito
7773f6b4f7
Restore the old toggle behavior of the special inventory floaters
2019-05-04 07:12:40 -04:00
Lirusaito
2b47e62dd8
Remove dumb dynamic cast children loop in toolbar init
...
:%s/\<button /button sound_flags="0" /
2019-05-04 03:51:12 -04:00
Lirusaito
3d21dc309c
Views fromXML can have sound_flags now
2019-05-04 03:40:08 -04:00
Lirusaito
6dadfaffac
Improve rect control name of inventory folder floater
...
This makes it more reliably usable and more understandable to the user.
The downside of this is that folders with the same name will have the same
position, but I don't think that really matters.
2019-05-04 03:34:38 -04:00
Lirusaito
f0ef3a4569
Fix defaulted inventory folder floater title
2019-05-04 03:31:50 -04:00
Lirusaito
140f5d3b0a
Make Outbox and Favorites like other new inventory windows
...
Yay search~
2019-05-04 03:24:28 -04:00
Lirusaito
22f314d158
Dynamically create Rect Controls for storing Inv in New Window Pos/Size
2019-04-29 00:15:43 -04:00
Lirusaito
8653ee79ea
Update Floater Inv Panel to be more modern
2019-04-28 09:02:43 -04:00
Lirusaito
0cc146a170
Change LLInstanceTracker to use a boost unordered map
...
Also remove unused functions and an unused typedef with it
2019-04-28 09:01:38 -04:00
Lirusaito
56378772cc
Add operator == for LLSD to llsdutil.h
2019-04-28 09:00:17 -04:00
Lirusaito
64561fa57b
[Radar] Feature Request: Make sort order persist
2019-04-28 06:30:20 -04:00
Lirusaito
b34021abd5
Fix Beware's notecard embed crash by immediately reflowing upon remove
...
We'll want to revisit this later and more optimally fix it.
2019-04-28 06:22:42 -04:00
Lirusaito
c6b17c9005
Probably fix Torric's issue of notes being overwritten
2019-04-28 06:17:57 -04:00
Lirusaito
331023e878
Strings and LLSD settings now get edited with a text editor
2019-04-28 03:39:13 -04:00
Lirusaito
d47fb4da03
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-04-28 01:21:51 -04:00
Lirusaito
40faef0bf8
If a setting is LLSD, display it in pretty print xml in debug
...
This should probably get its own TextEditor later on, it'd look better.
2019-04-27 03:04:11 -04:00
Lirusaito
b8c9d9c0f3
Clean up LLScrollListCtrl and add ability to getSortColumns()
2019-04-27 03:02:47 -04:00
Lirusaito
d33ae35fb3
OK in preferenes should save per account settings if possible
2019-04-27 03:01:49 -04:00
Shyotl
5f56d2d38f
Show channel in script text box dialog popdown
2019-04-26 22:52:59 -05:00
Shyotl
d7e7701927
Make texture fetch type (mFTType) a const member variable and remove from init() call. forceRefetch was clobbering mFFType via init call and firstinit boolean is a stupid hack.
2019-04-26 22:52:48 -05:00
Lirusaito
005ec30d7b
Max estate managers is 15 now
2019-04-25 17:07:51 -04:00
Lirusaito
15a8e1f08f
Don't limit estate managers on non-SL grids, let the grid do that.
2019-04-25 15:40:51 -04:00
Lirusaito
2d06d455cd
ProductEngines are Lindens, I guess.
2019-04-25 01:48:56 -04:00
Lirusaito
f2b773dac7
Fix linux build, thanks Router
2019-04-24 17:34:45 -04:00
Lirusaito
14774b03ad
Squash Nai's bug and still fix the issue?
2019-04-23 13:33:09 -04:00
Lirusaito
190e3e8c2f
Fix link replacement being enforced improperly, thanks Beware!
2019-04-21 22:06:33 -04:00
Lirusaito
0464e611c7
Sync with future branch for urls
2019-04-21 20:39:54 -04:00
Lirusaito
f7386e8e70
Update python stuff to latest
...
Probably definitely break linux
2019-04-20 16:28:51 -04:00
Lirusaito
a5be867238
Merge branch 'master' of https://github.com/Pytak/SingularityViewer into animesh
2019-04-20 10:28:58 -04:00
Router Gray
002cbce499
Regextra. Fix URLs with '?' params and probly other stuff too. Thanks Liru.
2019-04-20 09:21:20 -04:00
Router Gray
5f38bb4bf2
Make dullahan autoplay autoplay. Thanks Liru.
2019-04-20 09:15:46 -04:00
Router Gray
726141d6da
Fix LLViewerObject processTaskInvFile iterator double .begin() and no .end()
2019-04-20 09:14:48 -04:00
Lirusaito
ed09681479
There's no need to warn or even mention this, thanks Deltek!
2019-04-20 01:35:30 -04:00
Lirusaito
d194dfbc09
Sync with alchemyng for VCRedist update
2019-04-19 23:25:47 -04:00
Lirusaito
8ef3e923e8
Allow bare minimum urls in [url text] syntax
2019-04-19 20:07:46 -04:00
Lirusaito
564410ac7e
Fix some warnings and errors
2019-04-19 17:29:55 -04:00
Lirusaito
f2beb4443a
This should fix Linux, thanks Drake.
2019-04-19 16:52:40 -04:00
Lirusaito
1a88370566
Finish hooking up VLC and removing quicktime
2019-04-19 15:00:05 -04:00
Lirusaito
01b4339b6f
Fix configure
...
Not sure how Prebuilt.cmake worked in my repo but not others, but okay.
Of course I'd forget to stage the libvlc directory.
And somehow vlc-bin wasn't added to autobuild.xml?!
2019-04-19 13:11:52 -04:00
Lirusaito
308a249891
Pie menus were looking up settings each frame...
...
How am I the first to notice this.
Also, while we're here, let's clean up duplicate code and make some constexprs
2019-04-19 02:29:12 -04:00
Lirusaito
1244d5df03
Fix the chat bug, save the world~
...
Also fix badly written parts of LL stuff synced.
2019-04-19 01:16:27 -04:00
Lirusaito
f26425f17a
VLC instead of QuickTime
...
I dunno if it's actually in there yet... meh
2019-04-19 00:05:49 -04:00
Lirusaito
b28313559d
Update to VS2019, you now need autobuild-1.1 on windows
2019-04-18 23:49:47 -04:00
Lirusaito
d933472a16
Wooops, I'm sick and blind
2019-04-18 23:29:28 -04:00
Lirusaito
6c034506c3
Does this fix the issue with recent items not updating?
2019-04-18 20:55:17 -04:00
Lirusaito
8979f12111
Fix the chat bug, I think... also momre text base sync, yay!
2019-04-18 14:45:21 -04:00
Lirusaito
289d1055e5
Fix bad md5sum?
2019-04-18 13:55:56 -04:00
Lirusaito
41ebd51fca
C'mon, reallly?
2019-04-18 10:16:48 -04:00
Lirusaito
07569d008d
Fix compile issues, thanks Router!
2019-04-18 09:19:20 -04:00
Lirusaito
e5f3d1d8bc
Break Linux? Fix volume catcher? Only time will tell
2019-04-17 18:41:13 -04:00
Lirusaito
f670c774d3
Oh hey, we can do this part of VLC merge right now too!
2019-04-17 18:28:22 -04:00
Lirusaito
7c41dc2e7e
It's a syncing ship
...
Ha... get it?
I'm so lonely...
2019-04-17 18:09:39 -04:00
Lirusaito
7c40f3332f
Myan
2019-04-17 18:07:32 -04:00
Lirusaito
2df95bb4bd
Floater About VLC support
2019-04-17 17:57:22 -04:00
Lirusaito
68a4975fe1
Actually fix the removal of Starting session
...
Thanks for the assistance and testing, Router~!
2019-04-17 15:01:48 -04:00
Lirusaito
41c56f706a
It's all Greek to me
...
Thanks, Router!
2019-04-17 12:43:36 -04:00
Lirusaito
56962a26cc
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-04-17 12:43:28 -04:00
Shyotl
7f776c0d53
Fixed geom never generating in some scenarios.
2019-04-17 00:49:46 -05:00
Shyotl
bee0109e33
Reduce per-frame std::map lookups..
2019-04-16 20:08:10 -05:00
Router Gray
fd6b367746
Fix missed changes for is_trivially_copyable and make gcc happy about them ( #4 )
2019-04-13 16:43:47 -04:00
Liru Færs
5e12a9d057
Scream!
...
Thanks for looking into this Router
2019-04-13 10:07:34 -04:00
Lirusaito
5228451c9c
Fix a lag bug of chat vanishing at the start, 'cause that's wrong.
...
This might break chat, but I'm sleepy, so you get it untested...
do the math yourself if it's wrong.
2019-04-13 03:09:12 -04:00
Lirusaito
c78770138d
If a log file doesn't exist, just let the user know with a sound
...
Also a warning, in the log, displaying the path.
2019-04-13 03:02:26 -04:00
Lirusaito
947cf57100
And then I remembered windows is windows.
2019-04-13 02:53:01 -04:00
Damian Zhaoying
4a59efadeb
Fix spaming messages in assert and is_trivially_copyable on GCC 4
2019-04-13 01:02:38 -04:00
Shyotl
66b929c3fa
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh
2019-04-11 23:54:32 -05:00
Shyotl
c1d1059a9a
Feature: Hold shift to disable right-clicking rigged mesh.
2019-04-11 23:53:57 -05:00
Shyotl
ccacdf7e6b
Remove redundant pick hover logic. Already handled in LLToolPie.
2019-04-11 23:51:05 -05:00
Lirusaito
69100fcca3
Fix Dullazoom
2019-04-11 07:08:47 -04:00
Lirusaito
cd8edf933f
[Dullahan] Add browser hotkeys for zooming (doesn't actually work yet)
2019-04-11 06:51:30 -04:00
Lirusaito
00e9960d77
Fix compile
2019-04-11 06:14:35 -04:00
Lirusaito
c9eac98d53
Drake's trivially copyable optimop
2019-04-11 05:02:43 -04:00
Lirusaito
7fc90d3dce
Feature Request: Add SinguAlwaysUnderlineLinks to always underline links
2019-04-11 04:15:12 -04:00
Lirusaito
12890af0cc
Fix Folder Sharing logic bug, woops, thanks Shy!
2019-04-11 04:15:08 -04:00
Shyotl
3724cf0e68
Fixed some more header issues.
2019-04-11 03:12:48 -05:00
Shyotl
1cfd782bdd
Fix some compilation errors.
2019-04-11 02:54:21 -05:00
Shyotl
1351a2695e
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh
...
# Conflicts:
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
2019-04-11 02:02:05 -05:00
Shyotl
e49b484c2f
Updated rigged mesh selection/cursor hover handling.
2019-04-11 01:16:50 -05:00
Lirusaito
66a94c6778
Hide partner grid stuff always, unless advanced is selected
2019-04-10 15:34:26 -04:00
Lirusaito
278459bdf2
New Fonts to complain about!
...
Thanks Drake!
Tweaks panels to look good now that font is slightly wider
2019-04-10 15:26:23 -04:00
Lirusaito
ed88e55e04
Yay they updated llstring, who's ready for a full rebuild?
2019-04-10 12:38:35 -04:00
Lirusaito
5e1a102de4
Dullupdate: Fix not shutting down properly?
...
TODO: Rebuild on Linux
2019-04-10 11:37:59 -04:00
Lirusaito
27ed3ca4b9
Use pkgdir in manifest
2019-04-10 11:37:55 -04:00
Lirusaito
4ea1b8d666
Woah, new libraries? No wai!
2019-04-10 11:37:52 -04:00
Lirusaito
bfe221d571
Oh right, this complained...
2019-04-10 11:37:48 -04:00
Lirusaito
be65834e1b
Dullawoof: Okay, this should definitely fix Zoom.
2019-04-10 11:37:41 -04:00
Lirusaito
3b54658e52
Apparently this wasn't even needed? Why did Visual Studio warn me?
2019-04-10 11:37:37 -04:00
Lirusaito
3462f403fe
Dullasync
...
Fixes scaling issue
Also fixes the openid cookie
2019-04-10 06:43:14 -04:00
Shyotl
6675bb2276
Increase disk cache size limit.
2019-04-09 23:27:55 -05:00
Shyotl
3e0b75c4f7
Fix issue where alpha_mode_none and alpha_mode_emissive on rigged faces were being alpha tested and discarded.
2019-04-09 16:01:14 -05:00
Lirusaito
621a342809
What happens to a ShowParcelOwners deferred?
...
Does it render like a ShowParcelOwners in the forward?
Or fester like a bug when it's run?
Does it get reported like rotten meat?
Or forgot and coded over
giving users a treat?
Maybe it just sags like a heavy bird...
Prepare to Implode!
Thanks to Beware Hax for reporting this
2019-04-09 14:18:42 -04:00
Lirusaito
3ad4770b44
[Support] Show a concise indicator in chat for viewer channel/branch
2019-04-09 04:40:42 -04:00
Lirusaito
2c2d127683
Allow Unicode viewer channels
2019-04-09 04:37:23 -04:00
Lirusaito
6271dba5bf
Sync Variables.cmake with future branch
2019-04-09 03:56:59 -04:00
Lirusaito
c85f8345f2
Sync World Map Message as much as possible to retain OpenSim Compat
2019-04-09 03:56:23 -04:00
Lirusaito
1ef5dc2c5d
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-04-09 02:30:24 -04:00
Lirusaito
181c6ddd9d
LLGroupMgr Don't copy vectors around, we can use references
...
getMembersInRole with needs_sort will now sort the vector passed in
At the moment it's not used with this being true so it doesn't matter
Just take note.
2019-04-09 02:08:25 -04:00
Shyotl
8ed9934a87
Fix memory tracking bug with vertex buffers. (Cosmetic. Only affects debug stats)
2019-04-08 18:13:28 -05:00
Shyotl
99f9b98258
Keep llthread.h out of the precompiled header. Thanks.
2019-04-08 15:18:36 -05:00
Shyotl
e2cc2d600b
Update event poll to work with expected server changes. Timeout now behaves like status 502 (which is being removed by LL). Keeping 502 handling as well to maintain opensim support.
2019-04-08 15:18:10 -05:00
Lirusaito
6397261a33
Thanks Deltek
2019-04-05 07:52:38 -04:00
Lirusaito
b368664d96
Merge branch 'animesh' of https://github.com/DamianZhaoying/SingularityViewer into animesh
2019-04-05 04:35:26 -04:00
Lirusaito
5617a4e59b
This might be necessary for dullahan cleanup
2019-04-05 04:09:22 -04:00
Lirusaito
f137502020
Make sure to reenable the script and notecard editors when we get errors
2019-04-05 04:08:27 -04:00
Lirusaito
6a114ae027
Request: Make the description of Gemini more universally understandable
2019-04-05 03:55:12 -04:00
Lirusaito
8cb1e73fc0
[Animesh] Animated Mesh checkbox on Features tab of build tools
2019-04-05 00:26:23 -04:00
Lirusaito
293ab2c2a2
Remove duplicate toolbar visibility setting
...
Thanks Router!
2019-04-05 00:09:02 -04:00
Lirusaito
98bb191c4a
Quiet down
2019-04-04 23:43:13 -04:00
Lirusaito
d3d72eb03c
Wooops, inverted the logic! Look out!
2019-04-04 23:36:45 -04:00
Lirusaito
a3bf40fd69
Boost unordered containers in places, like for uuid types!
2019-04-04 22:22:21 -04:00
Lirusaito
a1d06e682e
Switch to using typedef'd uuid types everywhere and auto for iterators
...
Oh, and some related opts.
2019-04-04 22:20:21 -04:00
Lirusaito
48003c8bc9
Remove pointless forward declaration
2019-04-04 21:52:57 -04:00
Lirusaito
0552c9fde2
Fix incorrect comment
2019-04-04 21:51:21 -04:00
Lirusaito
f7cc3a9e73
Feature Request: Trim spaces off of end of script lines
...
In order to preserve your ability to edit, this only happens to the asset
we send to the server, you will not notice until you reopen the script.
This is done as optimally as possible, upon each save.
This feature takes into account the possibility that spaces may
be following a quote and therefore it does not trim spaces in these cases.
It is also aware that you may use escaped quotes inside a string, and that
that does not mark the end of a string and therefore whitespace
is not stripped then.
2019-04-04 21:50:39 -04:00
Shyotl
af8bb2a992
Trivial cleanup.
2019-04-03 13:56:26 -05:00
Shyotl
ac2d16b15c
Fix potential lod bug in mdodel decode.
2019-04-03 13:55:41 -05:00
Damian Zhaoying
6fb3c399de
New spanish translations
2019-04-02 13:09:45 -03:00
Damian Zhaoying
0c44b11e9c
Fix menu_radar.xml typo
2019-04-02 12:57:13 -03:00
Damian Zhaoying
5f4e4a0d54
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-04-01 18:12:27 -03:00
Lirusaito
7d56d772d4
Dullahan on not windows... my bad
2019-04-01 01:40:44 -04:00
Lirusaito
c848af3960
Merge in Dullahan support from future branch!
2019-04-01 01:26:16 -04:00
Damian Zhaoying
ee745a20ef
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-03-31 15:16:45 -03:00
Lirusaito
30f26f462b
Give the clock more room, in case of seconds ~ Deltek
2019-03-31 03:36:17 -04:00
Lirusaito
344dc90d56
Use C++11 time format flags
2019-03-31 03:13:02 -04:00
Damian Zhaoying
9b29fd1385
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-03-31 02:29:06 -03:00
Lirusaito
c8a9efe5c8
[OpenSim] Use x-grid-info everywhere, instead of old HTTPS thing
2019-03-31 00:23:50 -04:00
Router Gray
940994288b
[3:39 PM] CmdrCupcake: there is no /arch:SSE3
2019-03-30 19:11:56 -05:00
Router Gray
3e8fbc8179
Update most Windows 32 prebuilts
2019-03-30 19:11:23 -05:00
Damian Zhaoying
1644ee6fad
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-03-30 20:06:37 -03:00
Lirusaito
d419d29cc8
[VMM] Feature Request: Make Market Listings folder a system folder
...
Can't delete it, but now it's with the other system folders.
2019-03-30 01:26:52 -04:00
Damian Zhaoying
d5fae8dba7
Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh
2019-03-29 21:02:06 -03:00
Damian Zhaoying
7935b2e957
Fix some strings (shortcuts names) in Spanish Translations
2019-03-29 15:01:11 -03:00
Lirusaito
8f0bda3dab
Missed change for rigged picking
2019-03-29 05:57:23 -04:00
Lirusaito
8de93f4120
Update contributors/credits list
2019-03-29 00:56:56 -04:00
Lirusaito
84da9d4758
Hold shift to select rigged mesh with SGAllowRiggedMeshSelection = 1
...
Old behavior + shift with = 2
Thanks for the contribution, Router!
2019-03-29 00:56:01 -04:00
Lirusaito
20c4090f71
Fix LL showing up on employee profiles on other grids
2019-03-28 20:30:34 -04:00
Lirusaito
f3e18d135c
This looks wrong, let's fix it.
2019-03-28 03:32:26 -04:00
Lirusaito
0ca9047f8c
Optimize the way we send top scripts/object disable/return
2019-03-28 03:31:23 -04:00
Lirusaito
90e9bce8de
Boost::unordered is better than std::unordered, apparently
2019-03-27 22:28:29 -04:00
Lirusaito
6d1e9ee3d4
Fix Linux, Thanks Bitten
2019-03-27 19:52:01 -04:00
Virtual Nexus
7331001bb2
Nai did a fix :P
2019-03-27 19:31:27 -04:00
Lirusaito
aac8382cf0
Fix the missing group bug AND make Voice Chat Invite better
2019-03-27 19:24:42 -04:00
Lirusaito
5272c48b7a
Add getSLURL function to group and avatar actions
2019-03-27 19:09:38 -04:00
Lirusaito
81862e30d1
Merge branch 'animesh' of https://github.com/DamianZhaoying/SingularityViewer into animesh
2019-03-27 19:08:26 -04:00
Lirusaito
adb0efdf97
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-27 18:42:18 -04:00
Damian Zhaoying
2677f06d44
Fix bug in spanish string.xml
2019-03-27 15:22:45 -03:00
Shyotl
3a031e9364
Fix build.
2019-03-27 02:35:59 -05:00
Shyotl
d2a8863384
Added AMD Vega and Radeon VII to gpu_table.txt
2019-03-27 01:39:11 -05:00
Lirusaito
81277c2b25
Fix dev checkout message files path properly
...
Thanks for the assistance with the Linux path, Router!
2019-03-26 19:31:51 -04:00
Shyotl
a90cdd9c7e
Experimental SHOverrideRiggedBounds setting to generate more accurate avatar bboxes. Defaults to off, for now.
2019-03-26 14:59:44 -05:00
Lirusaito
2faca7d7e2
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-26 05:23:26 -04:00
Lirusaito
7be177e9ab
Fix a text editor bug with selection being lost when url segments updated
...
By doing it the right way, and calculating where the selection should be
after the change is applied.
Also no longer consider text editor modified if nothing was changed.
Also update cursor position so it doesn't move to the wrong place on update
2019-03-26 05:10:21 -04:00
Lirusaito
f2b39196a0
In dev checkouts, AppViewer now sets AppRoDataDir to newview
...
Crossplatform, settings, windlights, skins, the works~
No more copying~ <3
2019-03-26 02:23:51 -04:00
Lirusaito
a8f85f0d91
Don't create an empty effect with no name as the default effect...
...
At least, I think this fixes that
2019-03-26 01:13:25 -04:00
Lirusaito
b0ad7f6bf7
Merge branch 'animesh' of https://github.com/DamianZhaoying/SingularityViewer into animesh
2019-03-25 21:53:52 -04:00
Shyotl
7b5d7376c6
Make opengl extension loading be core compliant. Avoid issuing glGetString before context creation on Windows.
2019-03-25 19:21:45 -05:00
Damian Zhaoying
8bb694a910
Fix typos in menu_radar.xml
2019-03-25 21:12:17 -03:00
Damian Zhaoying
25f3f77849
New Spanish translations in string.xml file. (wereable items)
2019-03-25 19:28:13 -03:00
Lirusaito
06dfeb72d7
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-25 17:21:16 -04:00
Lirusaito
f9878e75e3
Fix remaining missing string, thanks Asriazh Frye!
2019-03-25 15:34:58 -04:00
Lirusaito
58ede9caee
[EEP] Some text editor stuff
2019-03-25 14:58:45 -04:00
Lirusaito
24beaf6ce4
Add wearable type strings.
2019-03-25 14:38:12 -04:00
Lirusaito
e46380f2d9
Clean up old strings
2019-03-25 14:37:46 -04:00
Lirusaito
ffe729a53b
[EEP] Use ExtEnvironment cap where possible
2019-03-25 14:33:14 -04:00
Shyotl
f3afe45e72
Fixed some gl errors.
2019-03-25 02:56:20 -05:00
Lirusaito
059fc7c4fa
[EEP] LLMessage Changes
2019-03-25 00:44:00 -04:00
Lirusaito
cb295bfabc
28c814e4ef probably needs this for linux
...
Thanks for testing bitten!
2019-03-24 23:50:02 -04:00
Lirusaito
0ac2560508
[EEP] LLMath update
2019-03-24 23:18:35 -04:00
Lirusaito
98d315b3f7
Translation Request: Wearables
2019-03-24 22:52:30 -04:00
Lirusaito
28de2ceed8
[EEP] Change to using LLTranslationBridge::ptr_t
2019-03-24 22:52:30 -04:00
Lirusaito
28c814e4ef
[EEP] Add all the new llinventory windlight settings files
...
Also add v3colorutil.h
Also update LLQuaternion and its LLSD pieces
2019-03-24 22:52:30 -04:00
Lirusaito
fdffe2e06a
[EEP] LLParcel changes
2019-03-24 22:52:29 -04:00
Lirusaito
fb08f81e75
[EEP] Inventory/Folder type updates
2019-03-24 22:52:29 -04:00
Lirusaito
9affd767e4
[EEP] II_FLAGS_WEARABLES_MASK -> II_FLAGS_SUBTYPE_MASK
2019-03-24 22:52:29 -04:00
Lirusaito
9ccb015411
e5b81dd825 won't compile without this change
2019-03-24 22:51:35 -04:00
Lirusaito
e5b81dd825
[EEP] LLSDUtil changes
2019-03-24 21:04:51 -04:00
Lirusaito
fe33db1620
[EEP] LLSD Serialize Notation additions
2019-03-24 21:04:25 -04:00
Lirusaito
2e02f5ac2c
[EEP] LLSD Changes
2019-03-24 20:59:50 -04:00
Lirusaito
198d567df2
[EEP] LLUnitType changes
2019-03-24 20:59:26 -04:00
Lirusaito
b1ecf08013
Feature request: Colon after build number in support chats for nonactions
2019-03-24 19:48:20 -04:00
Lirusaito
7c9eb35568
We optimized llformat, let's not bother caching version string
...
It would be used less than once per frame, better to save resources.
2019-03-24 19:43:49 -04:00
Lirusaito
1839a37294
Only parse highlights (script keyword parsing) for script editor
2019-03-24 18:54:10 -04:00
Lirusaito
bd39b29c1d
Feature Request: Add a notification when receiving items from Marketplace
...
Turn this off with LiruReceivedItemsNotify
2019-03-23 08:38:59 -04:00
Lirusaito
1cc7c6b4cf
Translation Request: Make marketplace received translatable
2019-03-23 08:37:57 -04:00
Lirusaito
0cf4663c7d
Wooops, this belongs here, fix not online message translation not working
2019-03-23 05:44:45 -04:00
Lirusaito
424221201c
Actually save current Post Process Effect at logout
...
Also properly cleanup Post Process Singleton
2019-03-23 05:01:13 -04:00
Lirusaito
a14df55bd8
Liru never gets to sleep, not even when sick
...
Thanks Drake.
We don't get to use std::system, standardization is a sham,
nothing is sacred, why does anyone even bother?
Have a potentially broken Mac Implementation, too, why not?
It's not like we compile on mac anyway right now.
2019-03-23 04:57:56 -04:00
Lirusaito
c16fa02558
Support chats have build in every message, cool. This is optional.
2019-03-23 03:40:20 -04:00
Lirusaito
8946aa9ee5
If a group starts with "Singularity ", mark it as a support session
...
This is probably not the best way to go about this, but since we're
not in control of support groups on other grids, and we have support
groups in other languages we don't run on Second Life, this is better
than maintaining a list of IDs somewhere.
2019-03-23 02:07:02 -04:00
Lirusaito
c4f868cd89
Fix Deltek's briefly missing icon for adult results in search
2019-03-23 02:03:23 -04:00
Lirusaito
cc88b1edcd
Do this instead
2019-03-23 01:00:12 -04:00
Lirusaito
b3f918970b
Let's print out nonzero return codes
2019-03-23 00:57:06 -04:00
Lirusaito
3d26f79b8b
Dumb
2019-03-23 00:49:53 -04:00
Lirusaito
3d8e05fa2a
Remove ze gestures
2019-03-22 18:02:33 -04:00
Lirusaito
aaeb90436c
Actually, function operator comma order is impl defined, use erase remove
2019-03-22 17:13:37 -04:00
Lirusaito
42f4c816b7
[Animesh] Restore Quick Settings Hover Slider responsiveness
2019-03-22 03:57:58 -04:00
Lirusaito
8d06ea5a15
[InvOpts] Folder View unordered opt pass 2: Linux Boogaloo
2019-03-22 02:58:51 -04:00
Lirusaito
9f23dcb0c4
[InvOpts] Folder View unordered opt pass
2019-03-22 02:10:43 -04:00
Lirusaito
5f1047c574
[InvOpts] Inventory Observer unordered opt pass
2019-03-22 02:09:44 -04:00
Lirusaito
8d1c345580
[InvOpts] Inventory Panel unordered opt pass
2019-03-22 02:08:12 -04:00
Lirusaito
3a17bf519f
Gesture Opts Pass 3, mainly fixes
...
Fix a linux warning, thanks Router!
Fix Linux compile errors, Thanks Router and Bitten!
Thanks to Gooz for confirming speed boosts.
Also cache end iters maybe minor boost.
2019-03-22 00:56:09 -04:00
Lirusaito
7599b00a13
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-21 22:04:46 -04:00
Lirusaito
f5492144ad
Gesture Optimization Pass 2
2019-03-21 22:01:13 -04:00
Shyotl
d61f89e3c9
Defer bbox generation for rigged meshes until actually loaded. Fix math bug.
2019-03-21 17:22:33 -05:00
Lirusaito
879cd79fdc
Gesture UI optimization, first pass
2019-03-21 03:24:44 -04:00
Lirusaito
c2f15ff47c
[Joystick] Detect xBOx cOntrOLLers in ANY cAsE
2019-03-21 01:27:57 -04:00
Lirusaito
c9226f6b63
[Joystick] Use the button layout for the chosen controller type
...
Using the drop down now FORCES your controller to be detected
as your selection for the duration of the session until you choose another
2019-03-21 01:26:23 -04:00
Lirusaito
95ff7acd6d
[Joystick] Do the code better
2019-03-21 01:09:47 -04:00
Lirusaito
0673e70aca
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-20 20:24:46 -04:00
Shyotl
fd53ff014e
Minor bugfix.
2019-03-20 15:34:23 -05:00
Lirusaito
f5cbae3958
Support Halcyon as though it were opensim, for now.
2019-03-20 00:27:06 -04:00
Lirusaito
273c9b3479
Call ShellEx for launching urls in browser on Windows
2019-03-19 21:28:39 -04:00
Lirusaito
3f9f79c155
Fix an oopsie woopsie, thanks Shyotl
2019-03-19 21:09:26 -04:00
Lirusaito
3a5b8a1075
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
2019-03-19 20:56:49 -04:00
Shyotl
5a9ad787d5
Made rigged matrix cache toggleable via setting, for testing. Speculative fix for hairbase incorrectly appearing on animesh.
2019-03-19 15:17:14 -05:00
Shyotl
7f7267027e
Merge remote-tracking branch 'liru/animesh' into animesh
2019-03-19 13:21:17 -05:00
Shyotl
c19ef521b3
Lazy micro opt.
2019-03-19 13:20:28 -05:00
Lirusaito
83270e13f8
Woops, where'd that semicolon go when we most needed it?
2019-03-19 02:43:53 -04:00
Lirusaito
cfc71a47db
Fix up ShellEx
...
It's now crossplatform wrapper for std::system opening of a file/path/url.
It returns an int just like std::system, 0 means it worked.
It's static so you don't need to gViewerWindow->getWindow() anymore,
honestly it should've been static in the first place.
Clean up other code to use this function because duplicate code sucks.
# Conflicts:
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowsdl2.cpp
2019-03-19 02:43:35 -04:00
Lirusaito
45228f920d
Cleanup excess code and gURLProtocolWhitelist, add isWhitelistedProtocol()
...
# Conflicts:
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowsdl2.cpp
2019-03-19 02:41:31 -04:00
Lirusaito
627c0a6b57
Fix overzealous regex not letting ) be part of secondlife.com urls
...
Thanks to Bitten and Router for reporting and testing.
2019-03-18 18:16:54 -04:00
Lirusaito
573c493d5d
Prevent unused variable warning.
2019-03-18 18:14:06 -04:00
Lirusaito
c5329968f7
Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer
...
# Conflicts:
# indra/llcommon/llstring.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
2019-03-18 17:30:34 -04:00
Lirusaito
d235e045d8
Do better
2019-03-18 15:26:18 -04:00
Lirusaito
bb26127ed5
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2019-03-18 14:38:21 -04:00
Lirusaito
beddc1cb21
Avatar count on map tiles by default
2019-03-18 14:37:59 -04:00
Lirusaito
acc6f6b3c3
Reapply ability to develop UI/skins without needing to copy files
2019-03-18 14:09:18 -04:00
Shyotl
30f6dc2b2d
Allow more than 2gigs of texture memory... Fix shader buggles.
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2019-03-18 00:16:34 -05:00
Shyotl
e0194d4d06
Allow more than 2gigs of texture memory... Fix shader buggles.
2019-03-18 00:11:24 -05:00
Shyotl
a224c392e8
Fixed a few remaining bugs. Including all settings.
2019-03-18 00:05:59 -05:00
Lirusaito
a6e08bfc0f
Try to do opensim login stuff if not secondlife, not just if opensim/wc
2019-03-17 19:26:25 -04:00
Lirusaito
b755880dd3
Fetch inventory via udp if http inventory is off
2019-03-17 17:49:58 -04:00
Shyotl
b082bce2b1
Fix build.
2019-03-17 15:40:55 -05:00
Lirusaito
1c13ace366
Let's be real about currency
...
Fixes grid response for real currency not being heeded in buy currency.
2019-03-17 14:29:45 -04:00
Lirusaito
da8692f6a3
Merge branch 'ManagedMarketplace' of https://github.com/DamianZhaoying/SingularityViewer into ManagedMarketplace
2019-03-17 13:34:00 -04:00
Shyotl
b81373366b
Animesh test changes. Also stop screwing with my commit messages, github.
2019-03-17 02:35:07 -05:00
Shyotl
aa37a0b539
Intermediary commit #3
2019-03-17 01:08:34 -05:00
Lirusaito
b71ee44505
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-17 00:22:55 -04:00
Lirusaito
dea8ac2cf8
Only tell the user that we're refreshing their balance on their actions
2019-03-16 23:02:24 -04:00
Shyotl
3a78568a6f
Intermediary commit #2 .
2019-03-16 21:35:33 -05:00
Lirusaito
6898697246
Be a gooder wlf
2019-03-16 21:47:32 -04:00
Lirusaito
820b223ea9
Deltek did a fix, thanks.
2019-03-16 21:46:16 -04:00
Lirusaito
769c6a2e03
Fix Region Restart floater not showing Region name
2019-03-16 20:32:23 -04:00
Lirusaito
7991a53f3b
Oh yeah, I did this...
2019-03-16 20:28:43 -04:00
Lirusaito
d1f386860c
Do not recenter the restart floater if it's been moved.
2019-03-16 20:28:15 -04:00
Lirusaito
eec7385045
[VMM] Fix the inventory key handling issue
...
Thanks for the help Router
2019-03-16 20:02:12 -04:00
Shyotl
2d8fbb89c9
Intermiediary commit.
2019-03-16 17:51:00 -05:00
Shyotl
7cf55fa993
Add missing files
2019-03-15 16:40:33 -05:00
Lirusaito
c260158a2c
Backport translatable not_online responses
...
Thanks for pointing this out, Damian
2019-03-14 02:23:06 -04:00
Lirusaito
3b654a0986
Be more like C++, please.
2019-03-13 20:27:52 -04:00
Damian Zhaoying
bd60dfb61d
Merge branch 'ManagedMarketplace' of https://github.com/Lirusaito/SingularityViewer into ManagedMarketplace
2019-03-13 20:40:39 -03:00
Damian Zhaoying
a07f90c158
Adding more news spanish translations
2019-03-13 20:40:02 -03:00
Lirusaito
9b6c34213b
[Voice] Volume numbers, not just a slider!
2019-03-13 19:27:56 -04:00
Lirusaito
c58df7a3d9
Make the viewer lighter by one or two BOOLs per slider!
2019-03-13 18:59:18 -04:00
Lirusaito
62462165b7
[Voice] Actually save the speaker volume settings.
2019-03-13 17:42:26 -04:00
Lirusaito
4069878d54
[VMM] Fix inventory management bug reported by Griss Alexandre
2019-03-13 16:34:31 -04:00
Lirusaito
72479ce61e
Fix warning, thanks for the heads up, Router!
2019-03-13 14:32:23 -04:00
Lirusaito
db547a53d6
Double Double HealthText Trouble
...
Thank Deltek
...And Cauldron Bubble?
2019-03-12 21:42:27 -04:00
Lirusaito
37c8c80b82
Merge branch 'ManagedMarketplace' of https://github.com/DamianZhaoying/SingularityViewer into ManagedMarketplace
2019-03-12 21:29:02 -04:00
Lirusaito
b279f4ce02
Get back in line!!
2019-03-12 20:48:11 -04:00
Lirusaito
4e34328156
Fix resolving grid uri on login screen looking bad
2019-03-12 16:54:31 -04:00
Lirusaito
757cf4c8e7
[Radar] Feature request: Add a checkbox for people with notes
...
This is off by default,
right click, hide columns to show or find it in Extras tab!
2019-03-12 16:28:00 -04:00
Lirusaito
1e0741cf17
[Radar] This belongs inside the cpp, we never use it from the outside.
2019-03-12 15:03:07 -04:00
Lirusaito
e0ec2bd886
[Radar] Rework mAge code
2019-03-12 14:27:28 -04:00
Damian Zhaoying
dd5a3352fe
Fixes & updates in Preferences panel
2019-03-12 09:35:00 -03:00
Damian Zhaoying
054825807a
More Spanish translations fixes
2019-03-12 08:27:12 -03:00
Damian Zhaoying
b2b5dd4eb8
My mistake, fixed
2019-03-12 04:19:18 -03:00
Damian Zhaoying
2b92c10625
More Spanish Translations fixes
2019-03-12 04:00:25 -03:00
Damian Zhaoying
29f20096fd
Fix typo in notifications.xml Spanish
2019-03-12 03:31:51 -03:00
Damian Zhaoying
8bbb6cf541
Merge branch 'ManagedMarketplace' of https://github.com/Lirusaito/SingularityViewer into ManagedMarketplace
2019-03-12 01:28:45 -03:00
Damian Zhaoying
03d4dde6a4
Fix some spanish translations in VMM build
2019-03-12 01:27:11 -03:00
Lirusaito
68fd65b55a
Clean up
2019-03-11 20:45:34 -04:00
Lirusaito
7d97ebf581
[VMM] Fix the labels over labels issue
...
Reintroduces a searching bug, but only for marketplace top level folders
Arguably a better bug than what appears to be character corruption due
to labels drawing over each other.
2019-03-11 20:45:26 -04:00
Lirusaito
2b40e044c4
[VMM] Opts
2019-03-11 20:40:29 -04:00
Lirusaito
2bc0360d8e
Revert "Don't draw what's being filtered!"
...
This reverts commit eb348c08ad .
2019-03-11 18:52:18 -04:00
Lirusaito
cd68104de1
[VMM] Fix the sort menu, display sort button
2019-03-11 16:59:47 -04:00
Lirusaito
7da511fc32
[VMM] Fix a crash on delete listing, probably due to perceived recursion
2019-03-11 16:59:16 -04:00
bittenbythedark
84608b67fa
Update CRT Bundle
2019-03-11 15:46:16 -04:00
Lirusaito
121ba63347
[VMM] Remove this, not needed.
2019-03-11 14:00:49 -04:00
Lirusaito
1ea476b634
[VMM] Hide the WIP dropzone
2019-03-11 14:00:31 -04:00
Lirusaito
8c31a0e2c5
[VMM] Dirty children's filters when dirtying our filter
...
Fixes inability to expand folders that show up in areas they were
previously filtered in. Yay, VMM is pretty much ready.
Drop Target doesn't work and we're hiding the sort menu because it's
glitchy, but GG!~
2019-03-11 13:50:23 -04:00
Lirusaito
a3365512b3
[VMM] Opt: Only do this when rearranging, actually.
2019-03-11 12:43:36 -04:00
Lirusaito
c231e555da
Deltek fixed another font issue on Win7, yay!
2019-03-11 03:07:37 -04:00
Lirusaito
4a0e78fcbc
[VMM] Fix the stutter
...
Introduces a bug where previously filtered folders cannot be opened
2019-03-10 20:01:42 -04:00
Lirusaito
eb348c08ad
Don't draw what's being filtered!
2019-03-10 18:57:15 -04:00
Lirusaito
e15a284ae5
[VMM] It's glitchy, but this hides the folders according to filter
2019-03-10 18:56:51 -04:00
Lirusaito
2f0b6e1e09
Small opt for filter stuffs
2019-03-10 16:45:04 -04:00
Lirusaito
feaa9e7def
[VMM] Fix warning about deserialization failure
...
This change looks better without space changes.
2019-03-10 14:25:58 -04:00
Shyotl
50007bbc62
Matrix mul is expensive. Affine transform is not. Do the latter instead.
2019-03-10 03:48:07 -05:00
Shyotl
6c15ee6556
Fix texunit->uniform location mappings disaster inherited from upstream. Kudos to Drake for sharing the nvidia warning logs and bringing this to my attention.
2019-03-10 01:30:26 -06:00
Lirusaito
320ae772f3
[VMM] Sync more, pay less
2019-03-09 21:37:38 -05:00
Lirusaito
be923a9ecb
Merge branch 'ManagedMarketplace' of https://github.com/DamianZhaoying/SingularityViewer into ManagedMarketplace
2019-03-09 21:33:23 -05:00
Lirusaito
a94ad1c1fa
[VMM] Sync with upstream for setting mHasVisibleChildren
2019-03-09 17:51:38 -05:00
Lirusaito
98ee2cbd7e
Gemini tab button flash, dun hurt my eyes!
2019-03-09 17:51:02 -05:00
Lirusaito
c164bd200e
Feature request: Report when we're refreshing the currency balance
2019-03-09 17:50:31 -05:00
Lirusaito
d2983deb48
Wrap main loop with try, not wrap try with main loop.
2019-03-09 17:25:12 -05:00
Damian Zhaoying
5071cbfc2e
Marketplace listing spanish translations
2019-03-09 19:19:37 -03:00
Lirusaito
7acce90927
Clean up
2019-03-09 15:40:35 -05:00
Lirusaito
f86a194962
Code sync
2019-03-09 15:40:26 -05:00
Lirusaito
a93ea1b90b
Remove duplicate code
2019-03-09 15:39:08 -05:00
Lirusaito
f1bb636f91
Feature Request: Build number in window title
2019-03-09 15:38:45 -05:00
Lirusaito
e55c8e20e5
[VMM] Empty Lookup Message
...
Even though it doesn't seem to show for some reason
2019-03-09 15:37:53 -05:00
Shyotl
5d75b3b223
Prep for animesh.
2019-03-09 01:51:50 -06:00
Lirusaito
c2eeea8b70
Fix linux compile and clean a thing
2019-03-08 19:03:24 -05:00
Lirusaito
b98d0461d1
[VMM] Make sort menu somewhat work
2019-03-08 18:25:36 -05:00
Lirusaito
a3493f5f6b
Fix a crash, make Statistics look prettier
...
Thanks, Aru!
2019-03-08 16:09:19 -05:00
Lirusaito
52245a7fef
Nevermind, that looks awful, guess I'll have to actually fix this
2019-03-08 14:27:29 -05:00
Lirusaito
af8eb800e6
Make Top Objeccts Focus work
...
Thanks for the grid to test on, Bitten!
2019-03-08 14:15:55 -05:00
Lirusaito
c37cb7b2c4
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-08 14:09:35 -05:00
Lirusaito
f8c8734e79
[PPE] Add SinguPostProcessDefault for setting active and persisting preset
2019-03-08 13:56:07 -05:00
Lirusaito
b7ef79f1b7
Fix missing return statement, thanks for the heads up, Router!
2019-03-08 13:53:43 -05:00
Lirusaito
28e464f368
Code Clean up
2019-03-08 13:51:14 -05:00
Lirusaito
26a7de79c7
[PPE] Preset overrides go in user settings now
2019-03-08 13:50:06 -05:00
Lirusaito
4ddac28142
Code cleanup
2019-03-08 13:38:38 -05:00
Lirusaito
fec7e95406
Fix compile and try to prevent that from happening in the future
2019-03-08 13:33:40 -05:00
Lirusaito
60db043325
Put some settings in order
2019-03-08 12:17:45 -05:00
Lirusaito
dc34799317
Hide the broken stuff with a setting
2019-03-07 23:45:14 -05:00
Lirusaito
77eb745abc
Fix notification bugs, sync with upstream, yaaay
2019-03-07 17:06:38 -05:00
Lirusaito
b005b2a53a
Rule #1 : Do Not Lie!
...
Don't lie about status codes to responders anymore
This may cause some bugs, but I highly doubt it, anyway, if it does,
that's what responders are for, to specialize handling in these situations.
2019-03-07 16:26:24 -05:00
Lirusaito
c6cc69b01b
[VMM] Added Feature "Copy Listing ID"
...
Take it from me, LGPL or whatever, I don't care, this is QoL
2019-03-07 14:08:19 -05:00
Lirusaito
1e4da55190
No anims, no send
2019-03-07 13:39:12 -05:00
Lirusaito
7c3ba8bd9a
Sync? I dunno, not important.
2019-03-07 13:37:39 -05:00
Lirusaito
c7de0ccf99
Sync llinventorybridge and fix activate listing not working
2019-03-07 13:20:16 -05:00
Lirusaito
b601fa2037
Partial fix for teleport detaching
...
Thanks for the testing Nai.
Hey LL, if you're reading this, regions we've left were letting us know
that our attachments had left. For some reason, our attachments were dying
before we were removed from the list of agents on the region.
Teleporting out of Hippo Hollow does this reliably.
2019-03-07 12:51:55 -05:00
Lirusaito
cab39e31a1
Don't llformat if empty fmt string.
2019-03-07 12:47:29 -05:00
Lirusaito
79f42837f2
Morning, Bitten
2019-03-07 10:54:46 -05:00
Lirusaito
0378869938
Use proper json for Marketplace functions
2019-03-07 03:43:43 -05:00
Lirusaito
fc488959ea
Switch out jsoncpp for nlohmann json
...
Add llsdjson.* too!
2019-03-07 03:38:27 -05:00
Shyotl
cd340f0fb6
Linux compilation fix.
2019-03-07 00:37:17 -06:00
Lirusaito
626351e897
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-06 21:32:29 -05:00
Shyotl
d176a58d33
Replace in file oopsie.
2019-03-06 19:41:32 -06:00
Lirusaito
88639c2052
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into ManagedMarketplace
2019-03-06 17:10:33 -05:00
Lirusaito
322484c286
There's no need to dynamic cast.
2019-03-06 17:07:56 -05:00
Lirusaito
324f12641a
Remove redundant casts from c_str to string
...
Thanks Aru
2019-03-06 16:11:42 -05:00
Lirusaito
cd02bbd1cb
Fix mixed iterators
...
Thanks Aru
2019-03-06 16:10:31 -05:00
Lirusaito
22609412e4
Correct undefined behavior: shifting signed 32 by 31 bits
...
Thanks Aru!
2019-03-06 16:04:42 -05:00
Lirusaito
f0b3527bb5
Fix crash on saving notecards noticed by Torric
2019-03-06 15:58:19 -05:00
Lirusaito
893946879a
[VMM] Sync up some llmarketplacefunctions code
2019-03-06 15:57:36 -05:00
Lirusaito
685fda1565
[RLVa] Some cleanup
2019-03-06 15:56:53 -05:00
Lirusaito
f3df997b5b
[RLVa] Allow inexact group name matches
2019-03-06 15:56:43 -05:00
Lirusaito
2d222c721b
[RLVa] Add remattach:<uuid>
...
Thanks for the assistance Caeil!
2019-03-06 15:56:01 -05:00
Shyotl
adfc916ea0
Minor SIMD opt.
2019-03-05 20:41:16 -06:00
Lirusaito
f8b355c9d8
Hide the outbox... I think
2019-03-05 18:31:46 -05:00
Lirusaito
d7c7360205
[VMM] Actually connect the sort menu (probably still not)
2019-03-05 18:31:29 -05:00
Lirusaito
2524b407be
Woops, that's still needed
2019-03-05 15:51:35 -05:00
Lirusaito
32c44e4883
Toggle typing with AO toggle
2019-03-05 15:23:04 -05:00
Lirusaito
95ab62b286
Clean up image metadata
...
Thanks Aru!
2019-03-05 14:17:54 -05:00
Lirusaito
ebd852a060
Make the No Listings Text able to do the url replacement thing
2019-03-05 14:09:08 -05:00
Lirusaito
4fdc1f3311
hide_border should save to xml
2019-03-05 13:50:36 -05:00
Lirusaito
4992d19e8f
Marketplace Validation look good please~
2019-03-05 13:50:06 -05:00
Lirusaito
c639b4cf6c
Inventory panels can have filename parameter now
2019-03-05 13:14:48 -05:00
Lirusaito
ee465c4169
Fix positioning of Render Compatibility - Deltek
2019-03-05 11:35:30 -05:00
Shyotl
5a7e0b05a4
Fixup texture compression.
2019-03-05 03:11:04 -06:00
Lirusaito
d770034e5c
Hook up the menu the old fashioned way
2019-03-04 20:31:17 -05:00
Lirusaito
fcb751ae4a
Couple fix ups
2019-03-04 19:37:53 -05:00
Lirusaito
e350824896
Fix layout of Associate Listing floater
2019-03-04 19:10:42 -05:00
Lirusaito
1586475232
Fix the inability to click the buttons
2019-03-04 18:30:03 -05:00
Lirusaito
17c0da930f
Spawn the menu on button click
...
TODO: Make a derived button that uses this showMenu function instead
So we can finally have menu buttons like upstream
2019-03-04 18:12:02 -05:00
Lirusaito
c985afa4f4
Remove more outbox parts, I think these were never even used
2019-03-04 17:34:14 -05:00
Lirusaito
3631396329
We shouldn't be needing these nullchecks anymore
2019-03-04 17:25:37 -05:00
Lirusaito
7cb6b29f1b
Toggleable menus don't exist yet
2019-03-04 17:12:25 -05:00
Lirusaito
5f487f4ce1
Don't cache if we already have it
2019-03-04 17:00:08 -05:00
Lirusaito
e1c3585b46
This logic looks backwards
2019-03-04 16:56:34 -05:00
Lirusaito
7766172831
Fix Router's linux error
2019-03-04 16:55:11 -05:00
Lirusaito
10f57e9a87
This didn't fix typing AO, let's not do this.
2019-03-04 16:54:30 -05:00
Lirusaito
59cb20bab8
Validation floater needs a rect setting
2019-03-04 16:54:12 -05:00
Lirusaito
2266a2a662
Let's build it with the factory map then.
2019-03-04 16:53:22 -05:00
Lirusaito
5ff3700203
I guess we're doing this now.
2019-03-04 15:56:10 -05:00
Lirusaito
065c56fce4
Fix HTTP Assets not actually being turned on, woops!
...
Thanks for the report and testing, Torric!
Thanks for building the test build, Bitten!
2019-03-04 14:59:50 -05:00
Lirusaito
ee3f48bcae
class parameter must go in the panel xml itself
2019-03-04 14:58:58 -05:00
Lirusaito
a2c055c379
Don't show root folder by default
2019-03-04 14:58:11 -05:00
Lirusaito
99703b1121
Should've removed this with the rest of Outbox
2019-03-04 14:57:51 -05:00
Lirusaito
4008cf519c
Redo start_folder to be like upstream has it now
...
start_folder in xmls must now be start_folder.name
This reverts commit 1405a7c103 .
2019-03-04 14:57:24 -05:00
Shyotl
6dc2e9e6df
Use proper symbol names
2019-03-04 11:12:20 -06:00
Shyotl
7317f28ab3
Clean up compressed texture handling. Exclude dynamic/client generated/local textures. Got rid of glh headers.
2019-03-04 02:03:45 -06:00
Lirusaito
a62b7d5ce7
Be more aggressive about stopping typing
2019-03-03 22:23:22 -05:00
Lirusaito
d2b32564b8
Stop typing AO when AO disabled
2019-03-03 22:23:03 -05:00
Lirusaito
c847bfb6a5
Close, please
2019-03-03 22:05:16 -05:00
Lirusaito
b6e36275bb
Don't crash, at least
2019-03-03 21:21:49 -05:00
Lirusaito
5e5dafac26
Fix validation text color violating skin colors
2019-03-03 21:19:11 -05:00
Lirusaito
9127b41923
Make Validation floater pretty too!
2019-03-03 20:43:31 -05:00
Lirusaito
74cd0ddd8b
I must've been out of it, we can sort, it's just different!
2019-03-03 19:01:18 -05:00
Lirusaito
b57b4dd102
Get this from the tab container and look no further!
2019-03-03 19:01:01 -05:00
Lirusaito
0b08c6bef1
UI Fix ups
2019-03-03 18:56:49 -05:00
Lirusaito
1405a7c103
Fix start folder because meh
2019-03-03 16:40:09 -05:00
Lirusaito
1d0214ed54
Remove the Outbox
...
Goodbye, old friend.
2019-03-03 16:39:16 -05:00
Lirusaito
21340ac775
Fix inventory not showing
2019-03-03 15:39:19 -05:00
Pytak
d2b1fb8b5d
Rename PyFX Water presets to include [PyFX] for consistence with WindLights
2019-03-03 21:36:20 +01:00
Lirusaito
179e2627eb
This was actually better before, I think
2019-03-03 15:36:13 -05:00
Lirusaito
c010c098fc
Updates
2019-03-03 15:35:13 -05:00
Lirusaito
4218011417
Merge branch 'master' into ManagedMarketplace
2019-03-03 12:56:03 -05:00
Lirusaito
2e97a396ce
Remove dupe include, thanks Router!
2019-03-03 10:42:36 -05:00
Lirusaito
58ba9e3617
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2019-03-02 19:01:49 -05:00
Lirusaito
27961f45f0
[OpenSim] Support create event & partner help URLs
...
Merges branch 'master' of https://github.com/bittenbythedark/singuosfork
2019-03-02 18:51:15 -05:00
Lirusaito
1e94239d06
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2019-03-02 17:01:18 -05:00
Lirusaito
a619d4e82a
Fix running, wooopsies, cached controls cannot be global static
2019-03-02 14:48:19 -05:00
Lirusaito
a2bf387147
Fix swimming not flying initially when swimming enabled
...
Also fix compile, woops!
2019-03-02 13:54:38 -05:00
Lirusaito
d8da1b7ab5
Cleanup some favorites code
2019-03-02 13:52:37 -05:00
Lirusaito
79a81258ec
Fix Release Blocker: Favorites not showing on login screen
2019-03-02 13:23:30 -05:00
Lirusaito
1b5b11907e
Fix Release Blocker: Swimming is on by default incorrectly initially
2019-03-02 13:19:33 -05:00
Lirusaito
0a80dd0d87
Fix release blocker: Endless swimming anims on water/air transition
2019-03-02 13:18:46 -05:00
Shyotl
64931839cc
Add compression textbox. Don't compress local assets.
2019-03-02 03:47:48 -06:00
Damian Zhaoying
f6cf4e2878
Big Update in Spanish language Files
2019-03-02 02:57:10 -03:00
Shyotl
e1cf05c327
Enable compressed texture. Also minor cleanup.
2019-03-01 22:19:11 -06:00
Lirusaito
1c2c10fc58
Set Text Editor Enabled before loading text into it
2019-03-01 16:00:30 -05:00
bittenbythedark
1c6bdf7aef
do some magic EXPECTO PATRONUM
2019-03-01 16:23:30 +01:00
bittenbythedark
b80be075d7
Add support for Partner URL on OpenSim Grids
2019-03-01 09:29:16 +01:00
Lirusaito
fb39f2d511
Merge branch 'master' into ManagedMarketplace
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/lltooldraganddrop.h
2019-02-28 23:58:08 -05:00
Lirusaito
2b8c630922
Merge branch 'master' of https://github.com/Pytak/SingularityViewer
2019-02-28 23:23:53 -05:00
Lirusaito
c420751ffc
Get these boost warnings out of our compile logs!
2019-02-28 21:57:52 -05:00
Lirusaito
92fd0f56b4
In the modern era, if we don't recognize a GPU, give it full class 3 support and pray
2019-02-28 21:51:44 -05:00
Lirusaito
28b1ed82a5
Steam Hardware Survey says 100% SSE3
...
It's been over a decade since SSE3 came out
Almost 95% of CPUs on Steam have support for SSE4.2
Therefore we are enabling optimizations for SSE3
but someone could easily make an SSE2 Build
2019-02-28 21:13:04 -05:00
Lirusaito
1850cd159d
My inventory patch everyone's been testing
...
I'm still wary, but let's toss it into our release, shall we?
This changes the maps in inventorymodel to unordered maps.
On the surface this seems like a good thing, definitely is for inventory loading.
It seemed a lot snappier to literally everyone before the HTTP Asset patch rolled out, so that's good.
Thanks to Router, Bitten, Gooz, Deltek, Damian, Melaniecosti, Torric, and anyone else I might be forgetting at the moment who tested this for me!
2019-02-28 20:23:21 -05:00
Lirusaito
9630632120
Enable wearable export
2019-02-28 20:17:33 -05:00
Lirusaito
8e18f2ab43
So sick of these EEP warnings in my log, add the asset types
2019-02-28 20:09:00 -05:00
Pytak
f599278d8d
rename non-prefixed PyFX Ambient windlights to [PyFX], add one new Ambient windlight, add PyFX 0.6 Ice water preset
2019-02-28 21:03:38 +01:00
Lirusaito
e89e57b5a0
[OpenSim] Feature Request: Allow passwords up to 24 characters long
2019-02-28 13:56:18 -05:00
Lirusaito
e3fe8d046a
Feature Request: "Focus on" button for Top Scripts
2019-02-28 13:53:15 -05:00
Lirusaito
56d23a03cf
Add ViewerAsset over HTTP support
...
Has fallbacks for grids without HTTP, of course.
Though some assets might be dropped initially, as it is untested,
but better than nothing.
2019-02-28 13:46:26 -05:00
Lirusaito
5de463638c
Backwards compatible usage of "ViewerAsset" cap for Textures and Mesh
2019-02-28 11:09:25 -05:00
Lirusaito
d6b5e9f5a5
Fix the wolf
...
It's cruel and inhumane, but it makes the boy cry less about sheep
2019-02-27 16:44:26 -05:00
Lirusaito
4ddc33e881
Forgot the UI, woopsie~
2019-02-27 15:39:27 -05:00
Lirusaito
bf17e716e9
Right click edit on a wearable should take you right to that wearable's tab
2019-02-27 15:37:36 -05:00
Lirusaito
43806994eb
Layer Tabs Needed Reimplemented
2019-02-27 15:36:56 -05:00
Lirusaito
c4a5b0acc8
Fix wlf camera preset icons not loading in a timely manner
2019-02-27 11:21:08 -05:00
Lirusaito
8c71d22bea
More code cleanup
2019-02-27 11:14:21 -05:00
Lirusaito
618ca2f011
Code cleansies
2019-02-27 09:53:36 -05:00
Lirusaito
f04156da0e
Add icon for Post Process button on wlf panel, by PyKat
2019-02-27 08:53:03 -05:00
Lirusaito
4ab397dfb2
Feature Request: Add our SL viewer group to the Help menu.
2019-02-27 07:06:21 -05:00
Lirusaito
7eab3337bf
Add menu function "URLAction" for menu items that have (sl)url userdata
2019-02-27 07:05:37 -05:00
Lirusaito
2f68adf73d
Merge branch 'master' of https://github.com/Pytak/SingularityViewer
2019-02-27 06:51:06 -05:00
Lirusaito
6f5202c8cf
Sorta fix Asi Weird and Negative Saturation
2019-02-27 06:50:55 -05:00
Lirusaito
313732ae25
Show Emoji/high unicode on Windows, where possible, thanks Deltek!
2019-02-27 06:36:04 -05:00
Lirusaito
e3ca2594bc
Simplify logic, clean up code.
2019-02-27 06:08:19 -05:00
Pytak
812ce207dd
update postprocessing and windlights with PyFX 0.6
2019-02-26 23:16:55 +01:00
Lirusaito
3b9a0cfbc8
Lowercase default looks bad next to windlight defaults, capitalize it.
2019-02-25 13:09:04 -05:00
Lirusaito
2a7fd8caa5
Clean up some god tools floater code
2019-02-25 12:50:32 -05:00
Lirusaito
46dff21e97
Feature Request: Post Process Effects from Quick Settings flyout
...
Adds a neat little signal for post process to fire when effects change
Isn't code wonderful?
2019-02-25 12:50:08 -05:00
Lirusaito
f4a22ef857
Patch AIXML to work now for import
...
Not bothering with export at the moment
AIXML"Stream" wasn't even using its stream in its constructor...
Someone clearly hadn't been using ACTUAL C++ for longer than C++'s existence like was claimed
...but then, that's literally impossible, so what could we expect...
And dear lord please stop throwing in constructors...
There are so many better ways to do this...
This use of throwing is why people dislike goto
It's hard to follow flow control that would be better done another way...
One day I'll fix it so it is, until then meh.
Rips out AIFile, since nothing is actually using it anymore and GPL code needs purged.
2019-02-25 12:46:41 -05:00
Lirusaito
0cadfbaddb
Why was this in the wrong position?
2019-02-25 12:33:24 -05:00
Lirusaito
e0b9f23dad
Clean up and simplify wlf panel code
2019-02-25 08:05:37 -05:00
Lirusaito
7071ac29e8
Do Opt Yes
2019-02-25 08:02:11 -05:00
Lirusaito
5578849508
On second thought, there's no reason to disconnect until region isn't alive
...
So let's not do that anymore, making us resilient against a grid that has
HTTP problems.
Thanks for the help, Aru!
2019-02-24 09:08:08 -05:00
Lirusaito
d096c043f0
Attempt to fix disconnects by syncing to match upstream eventpoll
...
Upstream no longer repeats requests or force disconnects
upon 404 or internal library error, so we shouldn't either.
2019-02-24 09:06:32 -05:00
Lirusaito
2882cb728f
Optimize llformat Even MORE, and clean up some code.
...
Thanks for the help, Aru!
2019-02-23 04:08:55 -05:00
Lirusaito
f9e3afaad2
Revert "Do llformat even better!"
...
This reverts commit 4f87e82a19 .
string::data can't be nonconst until C++17, maybe one day.
2019-02-21 03:26:08 -05:00
Lirusaito
4f87e82a19
Do llformat even better!
2019-02-20 21:40:05 -05:00
Lirusaito
a2701faa2b
Floss Finder: Igor
...
Igor is a dentist with more on his "plate" than he can handle
Watch as Igor tries to find all the floss in his patients' mouths
Starring Timmy the Tooth, and the Tooth Fairy; join all your favorite
oral hygiene friends in helping Igor solve his terrible tooth travesty!
(May contain traces of knockoff pokemon, talk to your dietician before consumption)
2019-02-20 21:22:24 -05:00
Lirusaito
9f2d8e6fff
Fix things, mainly make things more optimal... No, I didn't compile this
...
Run along, Nothing to see here.
2019-02-20 07:34:56 -05:00
Lirusaito
174a2d36aa
I found a leak, viewer-release found it too, let's use their fix
...
It's close enough to mine, although I disagree with using 0 for a pointer
instead of using nullptr, but alas, mergeability.
This damn leak happened at least every log line on Linux and Mac since
the dawn of time for the viewer... Disgusting.
Well, not every log line, but every log line mentioning a class, which is
most these days.
2019-02-19 11:55:42 -05:00
Lirusaito
2773c22f9b
Fix los argumentos truncamientos
...
Gracias a Damian
2019-02-17 16:46:51 -05:00
Lirusaito
50f9fbd728
Fix automatic bridge detach
...
Thanks Aru
2019-02-17 12:54:16 -05:00
Lirusaito
8f96442cc7
Woops, truncate, not substr
2019-02-15 23:41:06 -05:00
Lirusaito
0269affb69
I need less unstaged code
...
Here's pieces of the WIP offline->IM->online fix
2019-02-15 19:33:22 -05:00
Lirusaito
1c9fcbb387
Fix Linux compile
2019-02-15 19:29:06 -05:00
Lirusaito
368afacd14
Fix CSR Urls sometimes being broken
...
Thanks Aru
2019-02-15 19:28:34 -05:00
Lirusaito
9f160b11fa
Actually hook up LLAvatarResetSkeletonAndAnimations
...
Thanks Aru
2019-02-15 18:52:43 -05:00
Lirusaito
323c0a7e1e
Fix compile
2019-02-15 18:51:45 -05:00
Lirusaito
48541479fb
Compiles and fixes, fixes and compiles
...
Pull this commit, get through the trials
2019-02-11 21:49:01 -05:00
Lirusaito
97a6f8aeb0
[Favorites Bar] Compiles, but does it work yet?
...
Gimme time to put it somewhere and we'll find out~
Also here's navbar/ textures, because we'll need the favorites one.
2019-02-09 21:46:21 -05:00
Lirusaito
2e8e641024
Don't LogInventoryDecline from groups, stop spamming local chat
2019-02-09 21:18:58 -05:00
Lirusaito
1df39f81ee
[Local Textures] These should persist through relogs, duh!
2019-02-09 19:54:11 -05:00
Lirusaito
136cffbab9
What a drag
2019-02-09 16:51:53 -05:00
Lirusaito
2493c401f9
Force replacing registered urls everywhere that's not from another user
...
I think I covered all my bases:
Local Chat, IMs/Group/Conference Chats
Script Dialogs
Group Notices
There are a few others maybe, like notifications EMs can spawn but if
those are intentionally tricking people, grid owners should be informed.
2019-02-09 16:51:15 -05:00
Lirusaito
90285944d9
Line editors need to commit on return
2019-02-07 01:34:09 -05:00
Lirusaito
aa0fea6931
[Local Textures] Small hack to allow changing texture id
2019-02-07 01:33:34 -05:00
Lirusaito
8a4ab08810
Fix compile
2019-02-06 20:43:02 -05:00
Lirusaito
bd442fb412
[Local Textures] Some code polish
2019-02-06 19:51:54 -05:00
Lirusaito
d04067bd09
[Local Textures] Default updating to on
2019-02-06 19:49:39 -05:00
Lirusaito
a62d433262
Favorites on the login screen
...
Adds some guts for the favorites bar, I'll get to that eventually
2019-02-05 05:17:08 -05:00
Lirusaito
cb16e4edf0
Updat
2019-02-04 20:02:40 -05:00
Lirusaito
b2eb601fc4
We can move whatever we want into favorites
2019-02-04 19:36:01 -05:00
Lirusaito
0ce0f81144
Why do I still use windows, anyway?
2019-02-04 17:40:47 -05:00
Lirusaito
ae308a274c
Clean up the chitchat, console url replacement~
2019-02-04 17:32:04 -05:00
Lirusaito
e536820629
Autoreplace can be as long as chat input
2019-02-04 16:46:15 -05:00
Lirusaito
d2a42e47ce
Make agent slurls with name types open profile on click
2019-02-03 18:37:51 -05:00
Lirusaito
62628a66bd
Have a menu for agent slurls with name types.
2019-02-03 18:36:49 -05:00
Lirusaito
0478d90578
Right click linked names/groups/objects in chat, copy key
2019-02-03 17:38:43 -05:00
Lirusaito
d29832ce5c
Copy SLURL not SLurl, SLurl looks weird!!
2019-02-03 17:00:05 -05:00
Lirusaito
a0875697cd
Fix warning
2019-02-03 12:31:49 -05:00
Lirusaito
45c7c711ad
You need to wake upYou need to wake upYou need to wake upYou need to wake up
...
YouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUp
ouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpY
uNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYo
NeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYou
eedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouN
edToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNe
dToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNee
ToWakeUpYouNeedToWakeUpNeedWAKEUPNeedYouNeedYouWakeUpYouNeed
oWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedT
WakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedTo
akeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToW
keUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWa
eUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWak
UpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWake
pYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeUpYouNeedToWakeU
[~~~~~~~~~~~~~~~~~~~~~~~~~~WakeUp~~~~~~~~~~~~~~~~~~~~~~~~~~]
2019-02-03 12:31:36 -05:00
Lirusaito
c03250f09b
Do this better
2019-02-03 10:05:41 -05:00
Lirusaito
50f7893b2f
Add back the install while running viewer option
2019-02-03 10:05:23 -05:00
Lirusaito
6c219bd628
Feature Request: Shouts should be in bold.
...
Yes, they should.
2019-02-02 18:42:15 -05:00
Lirusaito
8208730130
No more temp upload on SL, don't waste the users' time.
2019-02-02 18:41:27 -05:00
Lirusaito
dc96269bc6
Do not grab focus during login, seriously uncool.
2019-02-02 18:39:33 -05:00
Lirusaito
3546b5777b
Oops, these are needed for the texture picker clicker
2019-02-02 13:57:01 -05:00
Lirusaito
a45b4ffb43
Code cleanup
2019-02-02 13:56:11 -05:00
Lirusaito
d08d2fdec8
Don't open a null id picture.
2019-02-01 11:55:15 -05:00
Lirusaito
b47ff37612
Allow clicking on pictures in profiles and picks to open them
...
Only works if it's not gonna spawn a texture picture, of course.
2019-02-01 11:54:55 -05:00
Lirusaito
1ec0eed867
Use link color for names in radar alerts, not white.
2019-02-01 10:28:06 -05:00
Lirusaito
3054be307e
Do it for object names too, otherwise talking through scripts looks wrong
...
Also this is needed for local chat ^^;
2019-02-01 10:16:19 -05:00
Lirusaito
0d22841da1
Woops, that's some inverted logic!
2019-02-01 10:13:07 -05:00
Lirusaito
d20dbaa7d2
Feature Request: Allow use of a separate color for linked usernames.
...
The setting is HTMLAgentColor, I will not add this to preferences for now.
Note that usernames before the colon in the chat are cached,
set before login to change it for everyone or relog.
Also hook up getStyle() for the registered urls,
cleans up some code in lltexteditor.
2019-02-01 08:12:12 -05:00
Lirusaito
a7886443c5
Do not color the : after names in local chat as a link!
2019-02-01 06:51:58 -05:00
Lirusaito
674abf478b
Fix skin previews, allow using images from paths on disk
2019-01-28 20:46:47 -05:00
Damian Zhaoying
0f96939828
Update Spanish Translations.
2019-01-27 20:29:31 -05:00
Lirusaito
2f4689ba37
Woops, forgot I decided not to make an icons subfolder in textures.
2019-01-27 20:11:46 -05:00
Lirusaito
045234912c
We can spell
2019-01-26 14:00:35 -05:00
Lirusaito
049c1e16b0
Aurora-Sim is now WhiteCore
...
Minor Alchemy merge in removing llvlmanager,
indra_constants no longer has *_LAYER_CODE
2019-01-25 21:21:55 -05:00
Lirusaito
c7ca3d9261
Add cinnamon
2019-01-25 19:33:20 -05:00
Lirusaito
a6cd08e056
Fix textures.xml
2019-01-25 19:33:20 -05:00
Lirusaito
d340b74bb9
Silly git, that's not how merges work!
...
Fix automatic merge errors
Also fix some other compile errors
2019-01-25 19:33:19 -05:00
Inusaito Sayori
fcf4cf88ea
More merge
2019-01-25 19:33:19 -05:00
Inusaito Sayori
758d45af68
LLInventoryFilterParams and other stuff to merge.
2019-01-25 19:33:19 -05:00
Inusaito Sayori
50d21405cf
More stuff until it works...
2019-01-25 19:33:18 -05:00
Inusaito Sayori
8ea58c8a7e
Fix the crash, it was a misplaced closing bracket, with a misplaced codeblock... figures...
2019-01-25 19:33:18 -05:00
Inusaito Sayori
7c1af50bda
Double check vmm merge against alchemy. (sync)
2019-01-25 19:33:18 -05:00
Inusaito Sayori
fd4155f4b6
Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213
2019-01-25 19:33:17 -05:00
Inusaito Sayori
1d6e2b4182
Warning fixies.
2019-01-25 19:33:17 -05:00
Inusaito Sayori
630819cfe5
Set visible and set frontmost.
2019-01-25 19:33:16 -05:00
Inusaito Sayori
4b04bc573b
Route stuff back into llfolderview until we're ready for the full update.
2019-01-25 19:33:16 -05:00
Inusaito Sayori
e38615d15b
Warnings fixes, mostly signed/unsigned mismatch
2019-01-25 19:33:16 -05:00
Inusaito Sayori
f140b4f35c
Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings
...
Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189
mAllowWear=>mAllowOpen (should probably just remove this altogether though
inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes.
Other stuff in this commit:
LLPanelInjector~
Sync lltooldraganddrop to alchemy
Sync notifications up with alchemy
Reorganize notifications some, to better merge with upstream
Remove duplicate InventorySortOrder in settings map
There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~
Wouldn't have been possible without help from Shyotl and music by Amanda Palmer
2019-01-25 19:33:15 -05:00
Inusaito Sayori
167d336274
Up to compile phase
...
at 20fd3e98b4
2019-01-25 19:32:15 -05:00
Lirusaito
0fca6ee425
More seriously C++14
...
...I hope
2019-01-25 19:30:58 -05:00
Lirusaito
748a952e81
Fix Script Count not being enabled when AllowSelectAvatar is true
2019-01-24 18:00:36 -05:00
Lirusaito
a30119706d
Add /setdebug chatbar command. Syntax: /setdebug <debugsetting> <newvalue>
...
The setting to change this command is SinguCmdLineSetting
This command supports using json for complex data types, like vectors.
If there's no new value passed, the debug will be changed true<->false,
this conversion will have interesting effects on nonboolean types.
Have Fun!!
2019-01-24 17:58:54 -05:00
Lirusaito
77cdc0fa4c
Stop spamming the log whenever preferences opens!!
2019-01-24 12:30:14 -05:00
Lirusaito
3bdf6e553d
Add InactiveFloaterTransparency and ActiveFloaterTransparency settings
...
Dear Users,
This removes FloaterUnfocusedBackgroundOpaque, to achieve the same effect,
modify InactiveFloaterTransparency, 1.5 should do the trick.
PS: The settings are in the Vanity tab at the bottom.
Now for developer nonsense:
Also sync a bunch of the UI code with upstream Alchemy for opts and shtuff.
Also let's translate the tooltips on the buttons on the top right of floaters
Translators note that not all new strings have been translated yet as not all are upstream.
2019-01-24 11:57:44 -05:00
Lirusaito
546422609a
Cleanup and simplify Script Count code
2019-01-23 23:37:54 -05:00
Lirusaito
b971799638
Woah, woops! Fix double click crash!!
2019-01-23 22:23:15 -05:00
Lirusaito
bedb567eba
Don't RenderHiddenSelections, it makes mesh select bad.
...
This change snuck into upstream in 2010 in a commit by Dave Parks titled
Fix for bad zipping of meshes and add mesh icon back to repository.
2019-01-23 21:35:49 -05:00
Lirusaito
b4cf0b429b
Sync LLSelectMgr with upstream Alchemy
2019-01-23 05:05:36 -05:00
Lirusaito
ca5fb91350
We C++14 now.
2019-01-22 03:31:07 -05:00
Lirusaito
621c0a0249
Don't double up separators in the context menu
2019-01-22 00:49:09 -05:00
Lirusaito
d0b7a983d1
Fix an edge case where the radar could now crash loop, woops.
...
Thanks to Deltek and Router Gray for reporting and testing! <3
2019-01-21 23:38:23 -05:00
Lirusaito
54cf0a6a91
Set up LLButton::Params and LLButton::initFromParams
2019-01-21 23:37:28 -05:00
Lirusaito
bde8782328
Add in LLLoadingIndicator
2019-01-21 22:31:18 -05:00
Lirusaito
c8d95e58c3
LLMenuGL Sync
2019-01-21 22:31:13 -05:00
Lirusaito
95cd6cf775
Sync up textures.xml a bit
2019-01-21 22:31:07 -05:00
Inusaito Sayori
dd7ab5a0ff
Underline all registered urls on hover
2019-01-21 08:48:54 -05:00
Lirusaito
865061faf0
Don't split link underlines, since we're not even using the query color
2019-01-20 15:46:29 -05:00
Lirusaito
02c06f1654
Don't leave links underlined if the mouse leaves
2019-01-20 15:45:52 -05:00
Lirusaito
0aa6fa9302
Fix scrolling not taking effect on certain sliders
2019-01-20 14:36:57 -05:00
Lirusaito
8a08964755
Request: Underline links when hovering over them, for distinguishability
2019-01-20 14:25:56 -05:00
Lirusaito
413c24bde8
Bug Fix/Feature: Make the spam of radar on open/close and login optional
...
Adds RadarAlertFlood and RadarAlertFloodLeaving
RadarAlertFloodLeaving requires RadarAlertFlood
Radar uses new announcements for these events.
These settings are off by default,
Find them in your local debug settings!
2019-01-20 14:23:43 -05:00
Lirusaito
f9fe8a056a
Remove duplicate and old/invalid code from llviewertexteditor.cpp
2019-01-20 12:12:27 -05:00
Lirusaito
d8c95f844f
Add url menus to the text editor!!
...
Hey there, Alpha User! This commit is riddled with complex words,
but here's what matters to you: This adds the ability to right click a
Name, URL, SLURL, or Object Name, or even an Email, and get some awesome
options just like v3 gets! Buuuut, unlike V3, if there was something else
you might want to do, we've still got you covered in the same menu!!
Also make the text editor's default menu an xml
Synced a lot from upstream
Unlike Upstream, actually combine the base menu with the url menu if we have a selection
Unlike Upstream and previously, don't create a new menu per text editor
Unlike Upstream, don't create a separate FriendSignal and ObjectBlockedSignal per text editor we need it in!!
Unlike Upstream, always show a Select All option
2019-01-20 09:40:56 -05:00
Lirusaito
61b1128d76
Allow menu xmls from v3 that use context_menu tag instead of menu
...
Just parse them as LLMenuGL for now, that's what they basically are.
2019-01-20 09:32:13 -05:00
Lirusaito
1317f26d04
Remove debug spew, my bad
2019-01-20 09:24:44 -05:00
Lirusaito
7112e163e6
Update our url stuffs!
...
Adds support for JIRA link labels from Alchemy. (Made less of a mess by me)
Adds support for x-grid-info, the future of x-grid-info-location from Alchemy.
Updates uriparser latest from Alchemy.
Updates llstring to be more in line with upstream Alchemy.
Fixes our LLURI Implementation
Updates LLURLAction to modern C++ stuffies~
Adds Email protocol support from alchemy
Sync LLSLURL with Alchemy, adding x-grid-info support.
Also keep NoProtocol Support because yaaassss~
(also we won't suffer from MAINT-5019 because we're not dumb.)
2019-01-20 09:13:05 -05:00
Lirusaito
4b4c8c8e37
Woops, each link needs its own style! Thanks for testing, Torric!
2019-01-20 04:37:53 -05:00
Lirusaito
3a159111f3
Don't duplicate code, that's silly.
2019-01-20 04:36:39 -05:00
Lirusaito
f6beee3693
Don't look for clicking urls during draw, do that later upon click
2019-01-20 04:35:21 -05:00
Lirusaito
4f32024d3b
Fix nearby media panel fading after time on Nearby Media Floater
...
How did no one notice I broke this in syncing over two years ago?
2019-01-19 10:47:21 -05:00
Lirusaito
edb6c0e8e9
Feature Request: Add a stop button to MOAP hover controls
...
Also raise up the speaker button two pixels so it doesn't look so bad.
2019-01-19 10:03:21 -05:00
Lirusaito
74af7dc80e
Add LLTextEditor::setLinkColor for when links need to be another color!
...
This fixes blue on blue in notices for the classic skin,
while it does affect other skins, it's not very noticeable.
Actually this change kinda makes links match skins better overall...
2019-01-19 06:18:44 -05:00
Lirusaito
e284efa648
Improve notifications a bit (mainly lets you click links in notices)
...
Actually respect the color they're supposed to be by setting text AFTER creation
Don't double up with setEnabled, we're setting read only through the constructor
Be Mouse Opaque, handle mouse events beyond scrolling, match group notices
Don't call things more than once, that's nonsense.
2019-01-19 05:07:27 -05:00
Lirusaito
4a0b012f5b
Oops, I never meant to stage this tentative change.
2019-01-18 23:56:43 -05:00
Lirusaito
e643bcfc98
Fix the ran off segmentation end bug properly (Torric's Notes bug)
...
Default segments are now any segment that have no distinct features,
these segments can be combined into a contiguous segment to save space
and to cut down on calculation complexity!
2019-01-18 23:21:23 -05:00
Lirusaito
526079d76c
Text editor small sync with upstream
2019-01-18 05:48:02 -05:00
Lirusaito
0c8f2f1ea0
Cleanup and add back an opt in text editor
2019-01-18 02:14:31 -05:00
Lirusaito
6e05e8d84b
Wake up Liru... how did this even build?
2019-01-17 21:20:44 -05:00
Lirusaito
cff27f33dc
Wooops, no more setting the muted local chat editor invisible like that!
2019-01-17 04:43:57 -05:00
Lirusaito
ed67f77f9f
Request: Add EmergencyTeleportSeconds to configure emergency teleport time
2019-01-17 04:43:01 -05:00
Lirusaito
eb0477f9d7
Fix profile notes being white and having a weird visual glitch
2019-01-17 04:41:55 -05:00
Lirusaito
5fa50192a7
Feature Request: Allow AO Enabled settings to be per account
2019-01-16 22:38:59 -05:00
Lirusaito
bba6ecba65
Request: Allow filtering nonlinks or links in the custom inventory filter
2019-01-16 22:34:22 -05:00
Lirusaito
dcc8013028
Allow scrolling and up and down arrows for slider manipulation.
2019-01-16 18:27:31 -05:00
Lirusaito
0ddfdad180
Fix ShowMutedChat setting not properly restoring.
2019-01-16 16:46:12 -05:00
Lirusaito
466b4bf5e4
Add keyboard shortcut Ctrl-Shift-C for Copy Raw
2019-01-16 14:34:27 -05:00
Lirusaito
a5632c08c7
Add "Copy URL" option to text editor right click menu when right clicking links.
2019-01-16 14:33:53 -05:00
Lirusaito
1dea1123de
Fix the issue with profile font and selection
...
Thanks for testing, Router!
2019-01-16 14:32:31 -05:00
Lirusaito
c419c4d560
Add UI for the replacing of urls to System->Security at the bottom
...
Moves the region restart preferences into Vanity->main
2019-01-16 13:03:58 -05:00
Lirusaito
269576805b
Replace URLs everywhere in text editors, like upstream.
...
This works for notifications, and profiles, and chats, and even updates!
Amazing, right?
SinguReplaceLinks is on by default, URL highlighting works regardless, no rogue labels with this off.
Select, right click, Copy Raw lets you copy the link with its hidden url shown
and you can paste it back the same way if you're wanting to paste it all over!
LLTextEditor overhaul synced the code with upstream LLTextBase as much as we could.
appendStyledText is now just appendText
Every setText appendText's now and adds a style based on the texteditor's color and font, this could slightly increase the weight of text editors (one extra segment) but it fixes a nasty bug with running past segmentation.
Also no longer update the utf8
Removed append() which was no longer being used
LLTextEditor and LLViewerTextEditor now have an extra boolean at the end of their constructors to have this replacement turned on at construction time (this also sets them read only)
Update TextSegments to have a Tooltip string, like upstream.
Hardened notecard previews so they don't accidentally replace the text when they go read only.
Thanks to Deltek and Router Gray for helping me test and debug this commit!
2019-01-16 01:01:19 -05:00
Lirusaito
0b52275e53
Fix radar popping up on right click focus if not announce when closed.
2019-01-15 17:36:28 -05:00
Lirusaito
9c06bbb8eb
Fix the expand buttons in the remote toolbars looking like garbage
2019-01-14 20:02:07 -05:00
Lirusaito
da5717f66e
Make the login screen destinations work
...
Syncs "location_login" from upstream LL viewer
2019-01-14 16:57:29 -05:00
Lirusaito
8250ec1872
Clean up repetitive code in llnotify.cpp
2019-01-14 15:14:13 -05:00
Lirusaito
1efc71db0c
Fix mic lock being inverted.
2019-01-14 14:46:50 -05:00
Lirusaito
062b8da2d3
Allow right clicking notifications when on right clickable ui.
2019-01-14 01:08:10 -05:00
Lirusaito
15ef9140da
Fix regression of not having a working viewer build without PACKAGE on
2019-01-14 00:35:52 -05:00
Lirusaito
2dc609ff6b
Fix Linux compile?
2019-01-11 12:49:00 -05:00
Lirusaito
8c7fceb081
Resolve and link registered SLURLS that are in chat.
...
Adds handle_registered_urls function
Use this as a drop in replacement for appendStyledText where applicable
2019-01-11 09:11:20 -05:00
Lirusaito
778b89d5c9
Feature request: When creating a new AO notecard, actually show it!
2019-01-11 08:33:49 -05:00
Lirusaito
b61cba8e01
Clean up and optimize the AO
...
Added the feature of selecting an animation from combo boxes and it playing automatically if it should be at this moment.
Now for the stuff only developers will understand:
FloaterAO is now a FloaterSingleton, because it should've been behaving that way all along.
Refactors a lot, simplifies a lot, best view without space changes.
Reduces a lot of redundant blocks.
Creates some functions to make things like AOStates easier to get
AOStates are now an enum instead of a bunch of const ints.
Cleaned up includes.
NULL -> nullptr, virtual->override, BOOL->bool, for->foreach
Removed struct_tokens, it was redundant and actually just took up space.
No longer set all the children invisible, their parent does a good job of that.
Relate ComboBoxes to their states, so that we can easily get a setting and do a whole bunch of things with a lot less code.
Remove unused parameters and functions and variables
Remove unused boolean returns from functions.
Don't clear combo boxes just because one id is null.
2019-01-11 06:17:58 -05:00
Lirusaito
0c585aca39
Random cleanup lines here and there before I refactor the AO entirely
2019-01-10 17:44:13 -05:00
Lirusaito
da2a9a5bf5
Add Typing AO
...
Like scripted AOs, this works whenever you type and AO is ON
Even if the Linden typing animation is not playing.
2019-01-10 17:42:59 -05:00
Lirusaito
47797f4cec
First pass at Swimming AO
2019-01-09 23:08:23 -05:00
Lirusaito
aef77312aa
Wooops, fix minor bug introduced in the conference thing.
2019-01-09 22:03:20 -05:00
Lirusaito
9a424ff264
Fix SV-2245: Viewer AO Doesn't respond instantly
2019-01-09 13:14:24 -05:00
Lirusaito
022fba2ba4
Add option "Add to Conference" to Conference chats and Instant Messages
...
Sync code from upstream for inviting people to conference via Avatar Picker
2019-01-08 11:27:51 -05:00
Lirusaito
adba4cf1fa
Beware the coral, it adds the reef factor
2019-01-07 17:39:54 -05:00
Lirusaito
0e21b53c2f
Sync installer with Alchemy for NSIS 3 support
...
Add a checkbox for creating desktop shortcut, restoring this functionality.
Fix install folder defaulting to 64-bit for 32-bit.
NOTICE: We now only support NSIS 3, no we don't care about your set up,
see our build-windows page for updated details on this.
2019-01-06 14:52:29 -05:00
Lirusaito
13816b696f
Fix reporter spawning notifications over and over
...
The user needs only one per session if that.
Also no longer have reporter processRegionInfo when it doesn't use that.
2019-01-06 09:46:14 -05:00
Shyotl
04ea11c61e
Make gcc happier.
2018-11-20 02:49:57 -06:00
Shyotl
523717477d
Experimental. Just busyloop mesh repo thread (hardcoded 60updates/second) instead of semaphore pingpong. Client behavior sucks and fetched meshes weren't being processed unless new mesh requests were being generated.
2018-11-19 00:48:50 -06:00
Shyotl
6d0b1889f2
Draw terrain before grass, because terrain is pretty cheap to draw, and hills are a thing and it would be nice if they z-culled.
2018-11-19 00:45:26 -06:00
Shyotl
bb67cba384
Bring alpha specular face blending in line with official viewer.
2018-11-19 00:43:51 -06:00
Shyotl
14e7b4aefe
scrolllists were incredibly slow to render. This included the friends and groups lists. Should be much faster now due to not thrashing the bound texture quite as much. Also ui elements are culled on the cpu side if they are out of the current scissor region. list cells also had no clip logic, so added to that as well.
2018-11-19 00:43:00 -06:00
Shyotl
1b9ce0b511
Prevent camera from freaking (shaking violently and eventually displaying pinkscreen) out if zoomed in unreasonably close.
2018-11-19 00:40:41 -06:00
Shyotl
bf5e7b794e
Change mesh fetch strategy a bit. Was getting stuck on stalled downloads forever instead of going on to other pending ones.
2018-11-19 00:39:49 -06:00
Shyotl
d7ee098a10
floorf was eating a fair bit of cpu time here.
2018-11-19 00:38:13 -06:00
Shyotl
736696ac36
Track glEnable states via static refs instead of map lookups.
...
Sync light state, bound shader, and various gl context states similarly to render matrices.
Texture handles now refcounted, as multiple viewer textures could ref the same handle (cubemaps do this)
Clean up gl extension loading a bit. Not necessary, but only look for ARB variants if not included in current core version. Removed unused extensions.
Use core shader api if supported, else use ARB. (FN signatures are identical. Just doing some pointer substitution to ARB if not core.)
Attempt at improving VBO update batching. Subdata updates better batched to gether per-frame.
There's probably other stuff I forgot that is in this changeset, too.
Todo: Fix lightstate assertion when toggling fullscreen with shaders off.
2018-11-19 00:37:48 -06:00
Shyotl
0b4d789afb
Altered LLIndexedVector. There's zero point to having a lookup map into an array like this. Just iterating down the array is faster than the map lookup (which iterates down a linked list...). A hash map would be a different case entirely.
2018-10-12 02:07:45 -05:00
Shyotl
55ad048b3a
Bring specular behavior back in line with LL viewer.
2018-10-12 01:40:31 -05:00
Lirusaito
252fdcdd1e
Collab with RouterGray to set Startup project automatically via CMake.
...
Also thanks to Alchemy, we think.
2018-08-27 18:42:27 -04:00
Lirusaito
13e2af8990
Request: Add setting SinguMotionResetsCameraReset to let the user decide if SinguMotionResetsCamera will Reset without their explicit action.
2018-08-27 12:33:02 -04:00
Lirusaito
8ecbf79199
Fix this because it shoulda been this from the start, oops.
2018-08-27 12:29:48 -04:00
Lirusaito
03d686a246
This is unused, remove it.
2018-08-27 12:27:40 -04:00
Shyotl
f03249f5d5
Update manifest and lldir_linux to use new crt file.
2018-08-12 19:53:07 -05:00
Shyotl
0d8dfb41bc
Fix gcc 4.9 build errors.
2018-08-12 18:26:07 -05:00
Shyotl
38c6302f11
Attempt to make mesh loading a little less choppy.
2018-08-11 01:09:04 -05:00
Shyotl
dcc13b447c
Fix compile post liru merge.
2018-08-10 23:07:27 -05:00
Shyotl
5d2eb3e4cf
Fixed hot spot in volume generation.
2018-08-10 23:07:13 -05:00
Shyotl
c8427140bd
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2018-08-10 19:30:01 -05:00
Shyotl
23228e111c
Ohgodthistypobrokeeverything.
2018-08-10 19:29:08 -05:00
Shyotl
2257e8ebe7
Add new required lib to newview.
2018-08-10 18:58:29 -05:00
Shyotl
3c87835f82
Delay mesh fetch retries to avoid hammering server endlessly if something goes wrong.
2018-08-10 18:57:39 -05:00
Shyotl
bc8c95a7f7
Minor cleanup.
2018-08-10 18:17:30 -05:00
Shyotl
369a3ed909
Replace CA file.
2018-08-10 18:16:48 -05:00
Shyotl
eb747e2304
Fix CURL failures
2018-08-10 18:05:00 -05:00
Lirusaito
e0df1a763c
Optimize resync_anims so we don't have to iterate over Every Single Object
...
Also minor opt to partial name2key code.
2018-08-10 15:15:20 -04:00
Shyotl
fe764ae97f
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2018-08-07 21:46:07 -05:00
Shyotl
0fc962454d
Fix shadows on basic alpha faces.
2018-08-07 01:53:06 -05:00
Shyotl
b1b415e862
Actually deallocate oversized mesh loading buffer.
2018-08-07 01:12:09 -05:00
Shyotl
b5f0355015
Dpi awareness should be set before creating the application window. In theory dpi awareness shouldn't have worked without this.
2018-08-07 01:10:48 -05:00
Shyotl
d11899561b
Optimization pass.
2018-08-07 01:09:53 -05:00
Shyotl
71f3002717
Merge branch 'master' of github.com:Shyotl/SingularityViewer
...
# Conflicts:
# indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
2018-08-06 20:42:32 -05:00
Lirusaito
9f03d1be05
How to enable "show muted text" box by default
...
Have a feature, Torric.
I should've already set this up long ago, sorry about that!
2018-07-27 15:38:01 -04:00
Lirusaito
899d1955c0
More SV-1908
2018-07-23 06:12:34 -04:00
Lirusaito
c962922e75
SV-1908
2018-07-23 05:53:00 -04:00
Lirusaito
562353929e
Actually fix SV-2181 this time? I think. It seems to work.
2018-07-16 02:55:40 -04:00
Lirusaito
4c8bd8d3ca
Sync some voice stuff
2018-07-15 12:12:21 -04:00
Lirusaito
e31c088470
Modernize the voice remote some.
2018-07-15 12:09:47 -04:00
Lirusaito
172eee49e5
Give local speakers lists a more radar-like menu
2018-07-15 11:56:35 -04:00
Lirusaito
14fd78a5af
Do the scroll list menu thing more cleanly.
2018-07-15 11:54:23 -04:00
Lirusaito
c056eacfab
Fix SV-2179: Wireframe - Rendering. Works only when Adv.light.model is disabled.
...
(Don't toggle ALM while in wireframe, bad things will happen...
or do, who am I to tell you how to live your life?
It'll look pretty cool actually, to fix that noise just toggle Wireframe once or twice.)
2018-07-15 06:26:04 -04:00
Lirusaito
ca2477a521
Update certificates
2018-07-15 06:00:09 -04:00
Lirusaito
c06c627002
Add four settings left out of 55b5f60b68
2018-07-13 20:54:49 -04:00
Lirusaito
6edd21bfe6
Don't limit the length of notecards and scripts, let the server scream at us instead.
2018-07-13 17:38:23 -04:00
Lirusaito
f1e6092b94
Sync LLViewerTexture with upstream
2018-05-02 19:30:47 -04:00
Lirusaito
1014841e2c
Feature Request: Repair Uploaded by functionality
...
Clean up llviewertexture a bit while doing so.
Sync LLImage
Thanks to Cinder and the Alchemy Team for this buncha code.
2018-05-02 19:30:22 -04:00
Lirusaito
dd49033a08
Remove VSTool
2018-05-02 19:20:38 -04:00
Shyotl
07835ea832
Speed up texture cache init. (Was exceptionally slow with a debugger attached)
2018-04-29 01:58:04 -05:00
Drake Arconis
a8e8f6d409
Fix gamma corruption
2018-04-26 15:54:30 -04:00
Drake Arconis
54fe7a8606
Well this...compiles
2018-04-26 15:54:24 -04:00
Shyotl
f9897b607b
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2018-04-09 02:51:22 -05:00
Shyotl
798f4c1a69
Avoid needing winver 601.
2018-04-09 02:50:44 -05:00
Shyotl
7a04780841
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2018-04-09 02:36:30 -05:00
Shyotl
d3e1edcc93
Windows dpi scaling.
2018-04-09 02:08:46 -05:00
Shyotl
50a0902f92
Fix projector reflections.
2018-02-19 01:58:32 -06:00
Shyotl
84da051385
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2018-02-13 23:07:15 -06:00
Shyotl
c77699dcd5
Speakerlist was taking a ridiculous amount of frame time when displaying large groups.
2018-02-13 23:06:41 -06:00
Shyotl
02865a9179
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2018-02-08 03:25:32 -06:00
Shyotl
410d2a83a2
llformat with std::string args is no bueno.
2018-02-08 03:25:02 -06:00
Shyotl
d46f96a8d6
Fix 'function uses ‘auto’ type specifier without trailing return type' spam in gcc due to accidentally using c++14 syntax.
2018-02-08 03:18:09 -06:00
Shyotl
ce1b58dd13
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2018-02-08 01:56:43 -06:00
Shyotl
05b8e08ee8
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2018-02-08 01:35:31 -06:00
Shyotl
24a05a2ebe
Add header and remove new unnecessary 'ignore' button handling due to 'ignore' checkbox now working for notify toasts.
2018-02-08 01:31:00 -06:00
Shyotl
2dc46964b4
Simple update check mechanism, and tons of notification tweaking to make the notifications look less crap.
2018-02-08 01:26:09 -06:00
Shyotl
30df7dacde
Add bulk speaker updates. Sped up speaker fetching by disabling list sorting during bulk updates.
2018-02-07 21:18:35 -06:00
Shyotl
fa628ce4d1
Use standard SL splash screen.
2018-02-05 01:40:36 -06:00
Shyotl
92eb988f2a
Pull in vertex buffer changes from alch.
2018-02-05 00:06:54 -06:00
Shyotl
ecc820f784
Fix shader compilation errors. Pulling bits and pieces out of massive set of unstaged changes never ends well..
2018-02-04 23:23:04 -06:00
Shyotl
85cb3cb0d0
Clean up deferred shaders by moving common methods into shared glsl file
2018-02-04 23:08:31 -06:00
Shyotl
ec91f9a026
Skip binding emissive shader for alpha glow. Caused huge pipeline stalls. Looking into alternate solution.
2018-02-04 23:08:07 -06:00
Shyotl
8fd728ca59
Clean up generated prepended shader preprocessor mess.
2018-02-04 23:06:16 -06:00
Shyotl
cf1ce7d7e5
Per-frame per-avie rigged transform matrix cache from Alchemy, with minor alterations.
2018-02-04 23:02:07 -06:00
Shyotl
54fc42cc73
Fixed ssao without shadows enabled. (Thanks LightDrake)
2018-02-04 23:02:01 -06:00
Shyotl
a39844f9f3
Double the maximum texture memory.
2018-02-04 23:01:44 -06:00
Shyotl
2195c2af37
And.. a missing line.
2018-02-04 23:01:38 -06:00
Shyotl
a3b37f58e3
Tweak shadows to look a little less crap.
2018-02-04 23:00:55 -06:00
Shyotl
d3dbbed6af
Explicitly alphamasked faces on HUD attached prims were not going into correct drawpool.
2018-02-04 23:00:30 -06:00
Shyotl
9b75abdb09
Fixed issues with ring rendering on mini and world map when ui scale was not exactly 1.0
2018-02-04 23:00:19 -06:00
Shyotl
bdf4c1a272
And.. a missing line.
2017-11-25 19:25:41 -06:00
Shyotl
647e6afa14
Tweak shadows to look a little less crap.
2017-11-25 19:20:21 -06:00
Shyotl
0e08d7d703
Explicitly alphamasked faces on HUD attached prims were not going into correct drawpool.
2017-11-25 19:20:11 -06:00
Shyotl
8776876e93
Fixed issues with ring rendering on mini and world map when ui scale was not exactly 1.0
2017-11-25 19:19:20 -06:00
Shyotl
1271eeb808
Merge remote-tracking branch 'liru/Release'
2017-11-18 11:09:40 -06:00
Shyotl
77ebb91d37
Resolve linker errors encountered on linux builds.
2017-11-17 23:21:03 -06:00
Shyotl
ca64b81785
Attempt at fixing windows build issue. Linux breakage TBD.
2017-11-16 17:48:22 -06:00
Liru
4e6eaa2849
New abuse reports upload the screenshot whenever possible
2017-11-01 18:15:47 -04:00
Liru
188704d177
Don't reduce the damn framerate, what's wrong with you?!
2017-11-01 18:14:34 -04:00
Liru
4aa943b871
XML sync report abuse with upstream
2017-11-01 18:13:36 -04:00
Shyotl
68c498163d
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2017-10-03 14:50:28 -05:00
Liru
0b35781d55
Refresh balance when it's clicked
2017-10-02 15:31:07 -04:00
Liru
f838fa5d45
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Release
2017-10-02 14:12:18 -04:00
Inusaito Sayori
2922f78c20
Merge pull request #30 from nikolas/patch-2
...
Variables.cmake: typo fix - BOOl -> BOOL
2017-10-02 13:29:24 -04:00
Inusaito Sayori
5be20f26f3
Merge pull request #27 from nikolas/detect-debian
...
Fix debian detection
2017-10-02 13:10:00 -04:00
Inusaito Sayori
0a01adf101
Merge pull request #31 from nikolas/patch-3
...
Variables.cmake: fix typo - Unkown -> Unknown
2017-09-30 23:56:55 -04:00
Nik Nyby
5e3e46847e
Variables.cmake: fix typo - Unkown -> Unknown
2017-09-30 23:48:25 -04:00
Nik Nyby
c68b7ff4a8
Variables.cmake: typo fix - BOOl -> BOOL
2017-09-30 14:12:58 -04:00
Nik Nyby
740153475c
Fix debian detection
...
My OS wasn't getting detected as Debian. This fixes that.
2017-09-29 14:10:55 -04:00
Inusaito Sayori
71c363e115
Merge pull request #28 from nikolas/patch-1
...
readme: update issue tracker link
2017-09-26 01:33:27 -04:00
Nik Nyby
8f40538d01
readme: update issue tracker link
2017-09-26 00:56:50 -04:00
Shyotl
733fca3d49
Http asset fetching.
2017-06-20 19:50:22 -05:00
Lirusaito
d7e5d07a77
For no real reason at all, update script limits floater code.
2017-05-13 10:44:09 -04:00
Lirusaito
e199a1a1d6
Make sure we're updating the VisualComplexity whenever we should be (sync w/ upstream)
2017-05-13 10:29:03 -04:00
Lirusaito
e8a0762eee
Firestorm can't be trusted.
2017-05-13 09:56:23 -04:00
Lirusaito
8cea1705d1
You asked for it, here's Classic Search back!
2017-04-23 18:49:55 -04:00
Lirusaito
a6236ab593
Prepare for upcoming changes to Region Agent Limit
2017-04-12 19:57:52 -04:00
Lirusaito
bb22201f4a
Revert the PyFx Ambient Dark and Ambient White changes
...
Adds Ambient Not As White and Ambient Not As Dark
2017-04-04 23:00:25 -04:00
Lirusaito
2eaf9a2c22
Add back Latif's CMake-based branding to BuildBranding.cmake
2017-04-04 21:16:29 -04:00
Lirusaito
c92ccf8a44
Branding shtuffs for the Singularity
2017-04-04 20:40:08 -04:00
Shyotl
7a5857e838
Minor cleanup.
2017-04-04 03:40:16 -05:00
Shyotl
b24635d24e
RMSE bugfixes.
2017-04-01 21:55:13 -05:00
Shyotl
1230748ef5
Alchemy llcharacter and llcommon merge pass.
2017-03-31 02:08:03 -05:00
Shyotl
f95be54bd5
Merge https://github.com/Lirusaito/SingularityViewer/tree/Release
...
# Conflicts:
# indra/newview/app_settings/settings_sh.xml
2017-03-27 23:25:33 -05:00
Shyotl
97a6f3a7b2
noisemap tweaks and cleanup.
2017-03-27 23:13:56 -05:00
Shyotl
f1063afea1
Tweak alphamask RSME and allow multiselect derender.
2017-03-25 00:35:48 -05:00
Lirusaito
0dfef2ab25
PyFx partial integration
...
Adds PyFx windlights and post process effects, not enabled by default.
Show custom graphics settings by default, because all our users are smart.
Tweaks SHAutoMask, uses Altocumulus as default cloud now
Added TODO into llrender/llpostprocess.cpp
We should also add the option to make the menu bar transparent, instead of pyfx using skin hacks
Also we need to add a settings preset feature at some point in the future.
We also need to add postproc to wlf.
2017-03-20 11:10:21 -04:00
Lirusaito
8e59d9800d
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer into Release
...
Fixed pipeline conflict over Mika/Shyotl variable naming differences.
2017-03-20 08:08:06 -04:00
Shyotl
1ccd8cfd89
Tweak tangents.
2017-03-17 00:54:48 -05:00
Shyotl
f4a713a500
Merge.
2017-03-14 04:02:53 -05:00
Shyotl
4a9ff22eeb
I was critically damp once. It was okay.
2017-03-14 01:44:26 -05:00
Shyotl
7dd616357f
Match AISAPI refactoring.
2017-03-13 23:58:56 -05:00
Shyotl
d42e380698
Minor cleanup.
2017-03-13 23:54:56 -05:00
Shyotl
75c47e96b6
Fixed numerous bugs.
2017-03-09 23:49:56 -06:00
Shyotl
6523cf43be
Fix some remaining callers to ui draw methods that have recently had their winding switched to CCW.
2017-02-26 23:19:12 -06:00
Shyotl
5d96bd8966
Fix winding issues with various ui draw methods. Face culling is actually disabled during ui rendering, but it's still good to do winding correctly regardless. Also automated tri strip batching.
2017-02-24 01:49:31 -06:00
Shyotl
d39ad79986
Update more full-screen shaders to no longer require texcoord attribs.
2017-02-18 01:18:39 -06:00
Shyotl
b9c3ca535d
Remove temporary render target used for debugging prior changes.
2017-02-17 23:41:10 -06:00
Shyotl
5e501b9611
Removed TT_RECT_TEXTURE and removed unnecessary shaders.
2017-02-17 23:37:46 -06:00
Shyotl
983a7e31dc
Have gl_rect_2d and gl_rect_2d_simple use TRIANGLES instead of TRIANGLE_STRIP
2017-02-17 23:15:45 -06:00
Shyotl
693781a014
Remove all QUADS usage. Replaced with TRIANGLES and TRIANGLE_STRIP. May do another pass and replace un-textured TRIANGLE_STRIPs with TRIANGLES to reduce flush calls.
2017-02-11 02:03:06 -06:00
Shyotl
aee659b518
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2017-02-08 01:00:32 -06:00
Shyotl
271c37442d
Prevent menus from clipping off the top of the screen.
2017-02-08 00:54:42 -06:00
miKaぴょん
7a1633abdf
Bento German translation
2017-01-19 13:29:10 +01:00
miKaぴょん
14ee1c5189
Make Second Life glow again.
...
Thank you Shyotl for hand-holding and instructions!
2017-01-14 08:38:00 +01:00
Shyotl
c262210cf3
Merge branch 'Release' of https://github.com/Lirusaito/SingularityViewer
2017-01-13 01:21:33 -06:00
Lirusaito
6707e481de
Apply Router Gray's Media Remote Controls for CEF hack.
2017-01-13 02:01:30 -05:00
Lirusaito
0bc98aad3b
Merge branch 'master' of https://github.com/miKa-pyon/SingularityViewer into Release
2017-01-13 01:01:58 -05:00
Shyotl
34fd992fb9
Un-break rigged normals when software skinning.
2017-01-12 23:48:23 -06:00
Shyotl
f62fded4bd
Use avatar-relative transforms when skinning via software, and translate to world coordinates after.
2017-01-12 23:47:58 -06:00
Shyotl
aa7c5e652c
Removed some C++14-only syntax.
2017-01-12 23:45:42 -06:00
Shyotl
632725e788
Prevent Edit->Attach/Detach menus from cumulatively growing larger every time LiruUseContextMenus setting was changed.
2017-01-11 18:10:09 -06:00
Shyotl
98516a2a22
Bento hell and back, and back to hell, and back.
2017-01-11 03:55:36 -06:00
miKaぴょん
b578b639e8
Fix SV-1891
2016-12-10 06:55:17 +01:00
Lirusaito
b5f1d5b435
Default to modern ARC
2016-10-21 18:10:54 -04:00
Lirusaito
efe83160a1
Fix incorrect attribute name resulting in shortened moap homepage urls
2016-09-14 18:13:16 -04:00
Lirusaito
e29776d2b2
:%s/"Block"/"Mute"/g
2016-08-23 15:45:53 -04:00
Shyotl
9dbdf75c14
Merge branch 'Release' of https://github.com/Lirusaito/SingularityViewer.git
2016-08-22 22:37:25 -05:00
Shyotl
583ea76c85
Experimental amd gpu workaround.
2016-08-22 22:33:28 -05:00
Shyotl
8e7574b9ae
Propogate correct mats shader mask for rigged alpha faces.
2016-08-09 00:24:28 -05:00
Shyotl
b8f1468ab5
Fix rigged faces not properly displaying mats properties on alpha faces.
2016-08-09 00:22:40 -05:00
Shyotl
4b318d072a
Wokaround for viewer crasher. Related to rigged mesh.
2016-08-09 00:18:28 -05:00
Lirusaito
1f53b80c9b
Fix nonmatching string literal
2016-07-20 07:33:14 -04:00
Lirusaito
707dc2f56f
Remove an extraneous "you" (thanks Fritigern)
2016-07-18 20:30:38 -04:00
Lirusaito
a1e7014524
[MediaFilter] Fix blacklist being swapped with whitelist for media
...
R&D by Router Gray.
2016-07-16 09:41:55 -04:00
Lirusaito
aacc250481
This seems more right...
2016-07-16 06:35:42 -04:00
Lirusaito
fbb144ede4
Update About Floater with up to date devs and maintainers info.
2016-07-16 06:35:16 -04:00
Lirusaito
b26bd29325
Media filter C++11 changes.
2016-07-16 06:31:28 -04:00
Lirusaito
b7edebf272
Conserve messages when right-click bulk kicking.
2016-07-13 23:44:58 -04:00
Lirusaito
dd74e69ab7
Fix a bug with <x] button, introduced by new behavior discussed in SV-2078
2016-07-12 07:27:30 -04:00
Lirusaito
e4544bec97
Linux BarkBark!
2016-07-10 16:59:16 -04:00
Fritigern
dad825d68d
Added icons for alpha versions, updated one icon in default, and modified viewer_manifest to also use these icons.
...
Signed-off-by: Fritigern <fritigerngothly@gmail.com >
2016-07-10 13:46:48 -07:00
Lirusaito
a9cf5743a3
Sync viewer_manifest mac stuff a bit for cef... pointless~
2016-07-09 23:10:58 -04:00
Lirusaito
21164d1f01
Silly Liru, bracket initializer lists are not expressions!
2016-07-08 16:59:13 -04:00
Lirusaito
eeb3a096d4
Fix signed/unsigned mismatch
2016-07-08 16:46:34 -04:00
Lirusaito
87b955b2ce
Giving your viewer one more std::
2016-07-08 08:36:12 -04:00
Lirusaito
da13f3599c
Woops, forgot to remove static, didn't even notice.
2016-07-08 02:05:25 -04:00
Lirusaito
727a91b689
Actually solve SV-2103
...
Tons of duplicate code cleanup, yaaaay~
2016-07-07 22:39:06 -04:00
Lirusaito
873b399ee8
Sync with obsidian in attempt to fix SV-2086
...
Applies MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add texture. Please wait a few seconds and try again."
Applies MAINT-5547 FIXED errors when texturing a linkset "Unable to add texture. Please wait a few seconds and try again."
2016-07-07 16:37:25 -04:00
Lirusaito
a6e905020d
Package textures/ subdirectories too.
2016-07-06 16:41:21 -04:00
Lirusaito
9fe563c9f3
Solve SV-2103: Estate Kick was Teleporting Home, which wasn't always a kick
...
Estate Kick button now offers choice between Kicking Home and Kicking Out.
Estate Ban always kicks out
Translators: Please update SV-2103 in notifications.xml appropriately
2016-07-06 00:51:28 -04:00
Lirusaito
755d4c242b
Fix SV-2105: Ban lines don't show up
...
Thanks to Router Gray for researching and solving this issue!!
2016-07-05 18:57:20 -04:00
Lirusaito
8308a0f769
Fix for FIRE-17419: Minimap property line corruption between VarRegions of different sizes
...
Thanks to Ansariel Hiller for this~
2016-06-30 00:24:10 -04:00
Lirusaito
e23a6f533c
Revert fix for SV-2078 until more people give feedback.
2016-06-29 18:52:48 -04:00
Lirusaito
31aa797f0e
Compile Fixy
2016-06-28 12:49:01 -04:00
Lirusaito
086af65f89
SV-2093: Add Block option to ScriptDialogs.
...
Thanks to routergray for helping me test this.
2016-06-28 10:33:48 -04:00
Lirusaito
e11b70415d
Satisfy SV-2101: Add LiruOnlineNotificationBehavior to allow configuration of behavior when FriendOnline notification is clicked
2016-06-28 07:56:02 -04:00
Lirusaito
b8ca422e71
Attempt to fix SV-2096
2016-06-28 07:35:23 -04:00
Lirusaito
a68a345c32
Fix SV-2078: Reset inventory type filter on clearing search filter
2016-06-28 04:36:09 -04:00
Lirusaito
31dbe29cae
Fix SV-2076: Mouselook button shouldn't show under most circumstances
...
Thanks to routergray for testing this fix.
2016-06-27 16:36:48 -04:00
Lirusaito
5bb9cda747
Hide Log button on own profile
2016-06-27 13:52:22 -04:00
Lirusaito
afb567265e
handle_web_browser_test should spawn internal browser.
2016-06-27 13:17:01 -04:00
Lirusaito
dfb049d13c
Update the VC redist package
2016-06-27 10:14:48 -04:00
Lirusaito
734d17c429
Linux Bark!
...
Thanks router!
2016-06-25 21:18:05 -04:00
Lirusaito
684ab3e3e5
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Release
2016-06-24 21:35:12 -04:00
Lirusaito
a3c2009a48
Fix GCC 4.8
...
Thanks Drake
2016-06-24 21:05:54 -04:00
Shyotl
f77df0ab83
Silence 'getCapability called before caps received for' console spam when fetching mesh. TODO: Check if a proper workaround is available in V3, as I worry that some meshes that failed the caps check may not get promptly re-generated upon caps receipt.
2016-06-21 02:22:03 -05:00
Shyotl
cd25894a39
Hack to resolve SV-2036. A lot of this code will probably get wiped out in a merge soonish, so not investing time into a more proper fix.
2016-06-21 01:54:21 -05:00
Shyotl
95f56f040a
Do not discard transparent specular-mapped fragments.
2016-06-18 15:35:11 -05:00
Lirusaito
39721e5bcd
Fix Chat History in list menus
2016-06-16 04:57:53 -04:00
Shyotl
8e622eaca6
Fix issue with nvapi-disabled path uncovered when performing a full rebuild.
2016-06-16 01:54:53 -05:00
Shyotl
4cbe3a63f8
Version 1.8.7
2016-06-16 00:18:10 -05:00
Shyotl
8a9296c6c2
Merge branch 'Release' of https://github.com/Lirusaito/SingularityViewer.git
2016-06-15 23:23:41 -05:00
Shyotl
bf3dbd66b8
Fix rlva force-detach crash, and autoresponse message setting not being updated.
2016-06-15 23:22:10 -05:00
Lirusaito
fa007905d1
Fix SV-2065
2016-06-15 23:52:36 -04:00
Lirusaito
ac593a694e
Fix the cmake issue with VIEWER_CHANNEL_NOSPACES
...
Thanks for helping, Friti!
2016-06-15 23:25:21 -04:00
Shyotl
f93c0b401f
Merge pull request #25 from AdeonWriter/master
...
Fixed female torso muscles slider not working above 50
2016-06-15 03:00:18 -05:00
Shyotl
027c3be694
Fix pickmasks.
2016-06-15 02:19:08 -05:00
Shyotl
5ccfc3257b
Merge branch 'Release' of https://github.com/Lirusaito/SingularityViewer.git
2016-06-15 00:05:10 -05:00
Shyotl
60e6f1000a
Removal of some debug spam regarding inventory filters.
2016-06-15 00:04:45 -05:00
Shyotl
2065e45011
Removed some old rlva code that was breaking serverside baking. Also merge some other minor inventory/appearance related changes from v3.
2016-06-15 00:02:18 -05:00
Lirusaito
6df030d706
Update the links for Report Singularity Bug and Request New Feature
2016-06-14 04:39:08 -04:00
Lirusaito
5c786e40ed
Update mIsHD3K patch to Drake's impl
...
Hopefully that'll squish the bug once and for all.
2016-06-14 04:11:26 -04:00
Lirusaito
bc93f2792d
Enable Crashing On Crashes
2016-06-14 04:05:38 -04:00
Lirusaito
8c86c1cd0f
Fix a buncha texture missing warnings.
2016-06-14 04:01:00 -04:00
Lirusaito
563f252dc1
Set AgentAppearanceServiceURL properly on login (fixes misplaced })
2016-06-14 04:00:33 -04:00
Lirusaito
a41ce2d281
When LLTextEditor calls onCommit, update its setting value if applicable.
...
Hook up commit on focus lost, too, have the autoresponse messages do that.
2016-06-14 03:59:35 -04:00
Shyotl
f47395531f
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2016-06-09 21:17:43 -05:00
Shyotl
ab01a68d92
Avoid needless gl context re-creation. FBO change detection logic was incorrect. Also, don't clobber fbo and skinned shader settings when deferred/shaders are toggled.
2016-06-09 21:17:18 -05:00
Inusaito Sayori
e486b9b1e8
Merge pull request #26 from miKa-pyon/master
...
Pull request for LiruCookies
2016-06-08 19:34:37 -04:00
miKaぴょん
c2c8e7f281
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2016-06-09 01:11:21 +02:00
Lirusaito
01bd9baf54
Fix AvatarRenderInfo not reporting.
2016-06-08 15:43:32 -04:00
Lirusaito
b8a2122b28
Fix SV-2054
2016-06-08 15:42:19 -04:00
miKaぴょん
a95b834711
Fix SV-2056, typo in media control panel XML
2016-06-06 02:15:24 +02:00
miKaぴょん
578b11ce48
Create TAR on linux build with package option only
...
The following configuration produces a usable linux viewer without creating a
package archive file:
autobuild configure -cConfiguration -pPlatform -- -DFMODSTUDIO:BOOL=ON
Adding the -DPACKAGE:BOOL=ON option will produce a usable viewer and create a
package archive file as well.
Cached build configurations might not reflect this change.
2016-06-05 21:34:03 +02:00
Lirusaito
548d1b6757
Solve SV-2042: Description on event notice now opens a floater, not search.
2016-06-05 13:26:12 -04:00
Lirusaito
6847833752
Feature Request: Make stats indicator on status bar open stats floater.
2016-06-05 12:58:15 -04:00
miKaぴょん
4bca069708
Fix SV-1957 with instructions from LiruCookies
2016-06-04 19:13:35 +02:00
Shyotl
0773f290cd
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2016-06-04 01:21:09 -05:00
Shyotl
4f4a6d4588
Avoid excessive string allocations in updateLineStartList. Fixes some performance issues.
2016-06-04 01:19:12 -05:00
Lirusaito
5adc705eab
Feature request: Make toolbar prefs optionally per account.
2016-05-29 09:47:42 -04:00
Lirusaito
05274c108e
Oops! Fix menu_viewer.xml (Thanks for pointing this out Damian!)
2016-05-28 16:32:10 -04:00
Lirusaito
ca6745e955
Guess that's not ready to merge.
2016-05-27 14:09:38 -04:00
Lirusaito
a8cf4a51b3
Seriously? I swear I hit save.
2016-05-27 12:52:29 -04:00
Lirusaito
330e30607a
Update LLAgentCamera
2016-05-27 12:42:17 -04:00
Lirusaito
f33429f1bb
Buncha pointless sync and cleanup
2016-05-27 12:17:30 -04:00
Lirusaito
8f14d86a5e
Re: Woops.
2016-05-27 10:53:48 -04:00
Lirusaito
7d73969c57
Oh gawd how did this happen?
2016-05-27 10:49:13 -04:00
Lirusaito
6fcbe9d0de
Increase DEFAULT_MAX_AGENT_GROUPS to 60
...
Also cleans up limits code stuffs and syncs indra_constants a bit.
2016-05-27 09:27:43 -04:00
Lirusaito
e5886e0959
Add option in Singularity menu to Resync Anims
...
#close SV-1321
2016-05-27 08:39:18 -04:00
Shyotl
8ff1f46d08
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2016-05-26 22:35:43 -05:00
Shyotl
fb96010d2a
Remove some console spam introduced when fixing issues with inventory filtering.
2016-05-26 22:35:14 -05:00
Lirusaito
7c6d21f67a
Woops, this line stays.
2016-05-26 14:39:22 -04:00
Lirusaito
fb9101598a
Update RLVLocks
2016-05-26 13:10:27 -04:00
Lirusaito
cfea4f4ccf
Compile Fixes
...
Updates RLVHelper.
2016-05-26 12:46:04 -04:00
Lirusaito
4bfd4b38bc
Aaaand more, this time for llagentwearables.cpp
2016-05-26 11:51:49 -04:00
Lirusaito
a388ddb0d0
More of the last, this time update llattachmentsmgr.cpp to the latest.
...
Hopefully it'll compile now?
2016-05-26 11:03:08 -04:00
Lirusaito
3bedb5f6d4
Sync llappearancemgr.cpp with upstream and rllva
...
Remove old unused stuff
Comment out some questionable stuff that's not upstream
Rearrange a thing to match upstream
Hopefully this fixes the baking bug?
2016-05-26 10:13:42 -04:00
Shyotl
0abb0c916c
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2016-05-26 02:28:34 -05:00
Shyotl
78eace26b3
Buffer overrun in LLMeshRepository::notifyLoadedMeshes
2016-05-26 02:22:38 -05:00
Shyotl
899ba7fded
Fixed folder collapse state not being properly restored after clearing search string.
...
Updated inventory filter classes.
LLInventoryView renamed to LLPanelMainInventory for easier diffing.
2016-05-26 02:22:19 -05:00
Lirusaito
c161a47970
Drake says we actually wanna doing this.
2016-05-10 21:08:20 -04:00
Shyotl
f89a5aaa27
Eups. Fix chatlog and user dir.
2016-05-03 01:54:50 -05:00
Lirusaito
b4f0ea4c78
More merge? More merge.
2016-05-03 00:08:32 -04:00
Lirusaito
3242683ee3
Alchemerge~
2016-05-02 23:18:09 -04:00
Lirusaito
32039e8b58
Too many thoughts at once.
2016-05-02 23:00:00 -04:00
Lirusaito
b77b5bbabc
Fix skin packaging for gemini
...
Adds package_skin to clean up redundant skin packaging code
2016-05-02 22:25:41 -04:00
Lirusaito
44cc052d40
Forgetful Liru
2016-05-02 21:53:17 -04:00
Lirusaito
f14ad54c84
Linux compile fixes
...
Reapplies a fix from c3e593c20e
Updates libraries (FMOD Studio 1.08.01)
Don't use boost chrono, the standard has chrono!
2016-05-02 21:17:36 -04:00
Lirusaito
f0a6ffcabf
Hopefully fix the logs thing?
2016-05-02 19:32:15 -04:00
Lirusaito
e50899dc68
Feature Request: Option to focus on avatar from instant message with them
...
Will be in the dropdown in IM at the bottom, only if they're in the sim...
Actually, this feature works pretty well as an in-sim indicator (if it works as intended!)
2016-05-02 19:06:12 -04:00
Lirusaito
a8062d732e
Clean up upstream merge artifact
2016-05-02 15:17:06 -04:00
Lirusaito
39b3f58e13
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
...
# Conflicts:
# indra/newview/llvoavatar.cpp
Also Reverted reversion of removal of before() wrapper in llstl.h
2016-05-02 15:15:06 -04:00
Shyotl
9e354801d8
Fix up generated artifact naming to include full unspaced channel name as well as arch.
2016-05-01 23:05:34 -05:00
Shyotl
df0b7a08cf
New library dependency: libboost_chrono
2016-05-01 20:43:01 -05:00
Shyotl
40b5627f7b
Use the correct xmlrpc prebuilt for win32.
2016-05-01 20:26:44 -05:00
Shyotl
f26a5e9d62
Added FTType to texture fetch methods. Baked texture fetch now uses dynamic retry policy.
2016-05-01 19:44:06 -05:00
Shyotl
abb4b1ac7c
Fix for scrolllist columns not resizing when header width is adjusted.
2016-05-01 19:41:19 -05:00
Shyotl
62ee456084
Ignore "BackgroundYieldTime" setting if file picker window is open (Improves responsiveness of said window)
2016-04-26 13:42:47 -05:00
Shyotl
55b5f60b68
V3 mesh, texture, and hover merge.
2016-04-26 13:36:39 -05:00
Lirusaito
cd66c61214
Just do it!
2016-04-15 03:43:34 -04:00
Lirusaito
62e8400c3c
Add Log button to Profile, (and rightclick menus for lists) as per request.
2016-04-15 03:26:02 -04:00
Lirusaito
de95e07907
Fix Deltek's issue: Altering the disk cache size is spammy
2016-04-15 02:49:55 -04:00
Lirusaito
b05f6ee9da
Sync llspatialpartition, fixes compile of two commits ago.
2016-04-12 20:57:23 -04:00
Lirusaito
b90d905cc5
Allow exclusively filtering out Landmark offers with AntiSpamItemOffersLandmarks.
...
This was requested on our JIRA, but then no one suggested any other things to filter.
2016-04-12 20:55:40 -04:00
Lirusaito
56bc3ae67a
Oh gawd this is gonna conflict with Shyotl..
...
but you people wanted Render Weight for some reason... so here it is...
Now we'll send it to the server, rejoice.
2016-04-12 20:02:25 -04:00
Shyotl
be5d2f20bc
llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default.
2016-04-11 02:51:08 -05:00
Shyotl
d40256fb31
llprimitive merge
2016-04-08 19:32:13 -05:00
Shyotl
691a5395ca
llmessage merge and further LLUnit usage.
2016-04-07 20:17:30 -05:00
Shyotl
8c946dc706
llmath merge
2016-04-06 01:56:39 -05:00
Shyotl
6ced17242b
llimage merge
2016-04-06 01:39:56 -05:00
Shyotl
0841479ccc
llcommon merge. Added LLUnits.
2016-04-06 01:31:20 -05:00
Shyotl
0fa7848b19
llcharacter merge
2016-04-04 23:45:15 -05:00
Shyotl
989c40e59a
llaudio merge
2016-04-04 00:38:57 -05:00
Shyotl
df41722c98
llappearance merge
2016-04-04 00:16:55 -05:00
Shyotl
9214750a90
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2016-04-03 13:22:36 -05:00
Lirusaito
9fee430d7d
Windows, please.
2016-03-31 22:17:16 -04:00
Lirusaito
62b6531468
I thought I'd done all these right already... meh~
2016-03-31 07:38:43 -04:00
Lirusaito
0c75255da7
Woops, for real this time!
2016-03-31 05:11:26 -04:00
Lirusaito
3e4f099ef2
Sync LLCompileQueue, fix compile (...queue)
2016-03-31 05:05:13 -04:00
Lirusaito
2653567d82
Sync with alchemy
...
Moves some constants out of llavatarconstants.h
8ebf8f4608bd: Change various const constants to constexpr
e07d5d43ba30: CID-143595
30b6935fc66d: CID-143595
acc96f9051cb: Fix a memory leak in viewer side baking initial wearable setup
Sync llmodel.*
Changesets assimilated:
f8f7706c2902: CID-143554 - fix out of bounds access
223eb65adce4: CID-143554 - Chase
2ceb49aaa133: CID-42838, CID-42930, CID-42933, CID-42938, CID-42940, CID-42945, CID-42948, CID-56111, CID-83907
d220005d9f23: Missing null check before deref
31dbb0f3b6ee: CID-42571 CID-42576 CID-42578
49caf082e65c: change unordered_map to flat_map
Doesn't cause as many problems as a hashmap when it comes to assumptions in the
LLUI system.
f93f5e881484: "update" linux cef
downgrade to fix javascript problems
cba818dd9269: Various null checks and etc.
1b4c6bc483bb: CID-42847, CID-42854, CID-42886, CID-42921, CID-42922, CID-42923, CID-42924, CID-42925,
CID-42927, CID-42928, CID-83871, CID-83876, CID-83878, CID-83880, CID-83900, CID-143573
0fe90cd9ec24: Various file size related things
a79f6f653dca: CID-42918 - Initialize member pointers in LLFloaterGodTools
0b70d600d978: Tweak LLFloaterBuyLand initializations
e8b173ffe813: CID-42854 - Additional fix to LLDrawInfo
b5d745cf3fde: Fix signage
4f2e2f384781: Initialize and cleanup various class member variables.
CID-42899, CID-42900, CID-42902, CID-42903, CID-42904, CID-42905, CID-42909, CID-42910,
CID-42911, CID-42912, CID-42913, CID-42967, CID-83853, CID-83898, CID-83890, CID-143584
9851a3e39b4c: Fix platform specific include directories
5c074e84f1be: Initialize and clenaup various more class member variables.
CID-42885, CID-42853, CID-42894, CID-42895, CID-42896, CID-83908, CID-143574, CID-143575,
CID-143576, CID-143576, CID-143578
ac262854ac92: Brace sub-object in initialization to make our intentions clear to clang
358da477d4c1: More double brace init
c3850119314a: Initialize various member pointers in panels
CID-83902, CID-83903, CID-83905, CID-83909, CID-83911, CID-83912, CID-143572
2016-03-30 21:06:47 -04:00
Lirusaito
7a48138404
But... I was so careful...
2016-03-30 03:43:50 -04:00
Lirusaito
32d3f9e929
Blah blah blah include blah
2016-03-29 21:07:04 -04:00
Lirusaito
1c0abf39fb
I swear I changed this back to name already.
2016-03-29 19:15:52 -04:00
Lirusaito
86a657f49c
Update llgroupmgr because why not.
2016-03-29 18:51:55 -04:00
Lirusaito
25937e42fe
I knew there was one more thing I had to do here.
2016-03-28 18:56:32 -04:00
Lirusaito
4afc6f5b6a
Woops, removed the wrong set of two.
2016-03-28 07:58:30 -04:00
Lirusaito
48e6e4eb98
Sync up llaudio/llaudioengine_fmodstudio.cpp: Compile now, please?
2016-03-28 07:50:48 -04:00
Lirusaito
89be63603a
Turn off pulseaudio support because it explodes right now
2016-03-28 01:57:44 -04:00
Lirusaito
e62261edb2
Sync with Alchemy, includes much awaited lib updates for Linux
...
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
2016-03-27 23:24:17 -04:00
Lirusaito
af58abb7ec
Fix symbols filename generation still relying on dead CMAKE Vars.
2016-03-24 00:46:19 -04:00
Damian Zhaoying
0383d4492f
Update spanish translations in menu_viewer.xml, panel_preferences_ascent_system.xml and panel_preferences_chat.xml files.
2016-03-23 02:43:15 -04:00
Lirusaito
5e7f64daaf
Alchsync: generate_breakpad_symbols.py
2016-03-23 02:32:26 -04:00
Lirusaito
b3b1a8b530
Missed a thing
2016-03-13 19:38:32 -04:00
Adeon Writer
c474ab344a
Fixed female torso muscles slider not working above 50
2016-03-10 16:31:40 -07:00
Lirusaito
1449169b0a
Restore Obsidian Win10 patch.
2016-03-06 18:50:26 -05:00
Lirusaito
77809f704e
Oops, this slipped by me in the merge.
2016-02-27 12:06:52 -05:00
Lirusaito
79965fade1
Alchemerge
...
Applies the following alchemy patches:
28fe46209ea5: Don't spam setPaused in fmod studio audio stream code
eb12ff41434a: Fix single click to walk triggering on huds
31955a7826b9: Fix double click to walk being triggered by huds and touchable objects
Fix double click to walk triggering while sitting and flying
Fix double click to walk behavior being inconsistent with single click to walk
Fix double click teleport being affected by transparent objects
Properly fixes MAINT-957
Compile stuff updates:
Adds VCRedist to package, should fix failure to launch reported by Nomade Zhao.
Updates package_description to better suit Singularity
Turns secondlife-bin in places to singularity-bin
Updates the following libraries:
Curl (7.47.0), gperftools (0.0.2), openssl (1.0.2f), SLVoice on Linux64,
2016-02-25 21:13:13 -05:00
Lirusaito
d15ac7640c
More C++11 cleanups, mostly from alchemy
2016-02-22 22:47:01 -05:00
Lirusaito
6a95f3b692
Fix Issue 1654 based on Shyotl's notes and work in Alchemy.
...
That's the Intel HD 3000 on Windows can't do ALM bug, by the way.
#close SV-1654
2016-02-22 20:51:22 -05:00
Lirusaito
ac03994861
Add debug setting LiruFlashWhenMinimized, because flashing taskbar is annoying!
2016-02-22 20:47:55 -05:00
Lirusaito
3227a44e0f
Sync with Alchemy.
2016-02-22 20:46:34 -05:00
Lirusaito
c3e593c20e
Fixes to gcc and debugs and such.
2016-02-15 16:35:31 -05:00
Lirusaito
731e907653
Add back the ability to install while a separate instance of the viewer is running.
2016-02-14 22:22:26 -05:00
Lirusaito
bf9899a99b
Scope on a Rope
2016-02-14 18:16:35 -05:00
Lirusaito
6e3f404a1c
Rip out old workarounds, hacks and macros for newer C++ features not being supported back in the day.
...
Adds LL_COMPILE_TIME_MESSAGE support to Linux.
llfinite -> std::isfinite
llisnan -> std::isnan
vector_shrink_to_fit -> vector.shrink_to_fit
2016-02-14 17:37:10 -05:00
Lirusaito
379543a405
Reorganize Autoresponse settings into a tab container.
...
Benefits:
There's now a lot more room on the autoresponse tab for more settings
- AutoresponseOnlyIfAway is now exposed.
The text field for response messages is now large
Drop Targets now take up the entire tab, so the item can be dropped anywhere within the autoresponse's settings context
Translators: panel_preferences_ascent_chat.xml
This will need some minor adjustments, obviously.
You'll also need to translate the new AutoresponseOnlyIfAway checkbox
2016-02-13 11:22:10 -05:00
Lirusaito
c5de5cf65c
Per account stuff now works with control_name, so do Autoresponse caching for Cancel like everything else.
2016-02-13 11:03:03 -05:00
Lirusaito
af91c02504
These should probably be cached controls, they're frequently checked.
2016-02-09 04:18:17 -05:00
Lirusaito
8320480971
AntiSpam bypasses for friends and own objects should override the antispam master filter
2016-02-09 03:51:39 -05:00
Lirusaito
0e349736b7
All search on SL looks awful, let's just use the Web tab instead now.
2016-02-06 10:52:56 -05:00
Lirusaito
710b75b3a9
Fix "Save As doesn't enable if File Menu is torn off"
...
SV-2005 #close Fixfixed
2016-02-05 23:38:58 -05:00
Lirusaito
07302b45fd
Branding fix for windows installer
2016-02-03 19:11:25 -05:00
Drake Arconis
ae09d3e397
Start to get windows installer generation and packaging in line with previous scheme to prevent shortcut breakage
2016-01-20 10:43:38 -05:00
Drake Arconis
6b84bfac15
Add a mechanism with which to determine viewer channel in the case of no commandline option
2016-01-20 10:09:23 -05:00
Drake Arconis
5e611669ab
Fix windows build
2016-01-20 10:08:44 -05:00
Drake Arconis
35c409f744
Fix linux64 config and cmake up
2016-01-20 07:22:34 -05:00
Drake Arconis
01bf430b1a
Get linux64 somewhat working
2016-01-19 10:07:27 -08:00
Drake Arconis
0180f965f7
Fix up linux autobuild config
2016-01-19 01:51:08 -05:00
Drake Arconis
8c69c4bcf0
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2016-01-19 01:49:02 -05:00
Drake Arconis
a75ed131b7
Fix up more prebuilt issues
2016-01-19 01:47:58 -05:00
Drake Arconis
ae0ad8af92
Fix up some prebuilt names
2016-01-19 01:44:28 -05:00
Drake Arconis
eef327f18b
Remove BerkeleyDB
2016-01-19 01:40:52 -05:00
Shyotl
bd26be78a9
Server occlusion prep.
2016-01-18 17:31:35 -08:00
Lirusaito
a62186c927
Merge branch 'master' of https://github.com/CmdrCupcake/SingularityViewer
2016-01-18 01:18:11 -05:00
Lirusaito
422db14725
Fix more warnings
2016-01-17 23:55:19 -05:00
Drake Arconis
949a9ab5dc
Largely rework llfile*
2016-01-17 23:33:21 -05:00
Drake Arconis
e545281387
Disable aixml* and comment out related classes for later fixing
2016-01-17 23:32:58 -05:00
Drake Arconis
78561d7ac7
Link LLCommon as static
2016-01-17 23:32:02 -05:00
Drake Arconis
681c85b122
Revert to older calc parser code for now
2016-01-17 23:31:38 -05:00
Drake Arconis
83338c1ee1
start to get linux64 working
2016-01-17 12:56:17 -05:00
Drake Arconis
0824055b29
Remove ELFIO
2016-01-17 11:45:35 -05:00
Drake Arconis
8a6bb4c00a
Add options for LTO and Incremental Linking for windows
2016-01-17 08:19:17 -05:00
Drake Arconis
0fe3a2623a
Fix double std::endl
2016-01-17 08:11:54 -05:00
Drake Arconis
6e73b33b91
Add missing header files for basic_plugin_base and media_plugin_base to cmake
2016-01-17 08:11:24 -05:00
Lirusaito
b9799a938a
Merge branch 'master' of https://github.com/CmdrCupcake/SingularityViewer
2016-01-17 04:13:47 -05:00
Lirusaito
3b7f801f90
[Radar] The final touches to make the title updating work perfectly
...
Special thanks to Mika-Pyon!
2016-01-17 02:28:55 -05:00
Drake Arconis
24b570d89c
Add flag to use quicktime prebuilt
2016-01-16 18:51:29 -05:00
Drake Arconis
58e08a972d
Get windows 64-bit building
2016-01-16 18:50:38 -05:00
Drake Arconis
47bdf3ecea
Minor fixes to autobuild.xml
2016-01-16 18:18:17 -05:00
Drake Arconis
69d67e57a6
Fix a VS2015 warning
2016-01-16 17:03:15 -05:00
Drake Arconis
615fe30ba8
Minor cmake cleanup
2016-01-16 17:03:04 -05:00
Drake Arconis
947f08a4d4
Add windows 10 versioning code
2016-01-16 16:43:32 -05:00
Drake Arconis
a17b849d84
Manifest for windows 10
2016-01-16 16:39:36 -05:00
Drake Arconis
466cc68580
Rename OS configs to normal variants
2016-01-16 16:28:14 -05:00
Drake Arconis
bb18bef58e
Add updated colladadom for boost 1.60
2016-01-16 16:23:04 -05:00
Drake Arconis
d219087950
Remove llqtwebkit, add cef
2016-01-16 16:14:04 -05:00
Drake Arconis
2a072bfc67
Add package-based licenses to about floater
2016-01-16 13:31:21 -05:00
Drake Arconis
a5b03d1c0f
Kill winmmshim, remove dead files
2016-01-16 13:14:09 -05:00
Drake Arconis
1d2995666f
Remove FMOD Ex
2016-01-16 13:07:51 -05:00
Drake Arconis
e8ec5d750c
Hacks to get fmod working for now
2016-01-16 12:49:35 -05:00
Drake Arconis
f36d4eb03a
Installer rework WIP
2016-01-16 12:49:25 -05:00
Drake Arconis
e9f4b917d1
Fix up icon copying and make manifest actually start to kinda work again
2016-01-16 11:18:40 -05:00
Drake Arconis
13666ac62a
Change out versioning code for less hacky versioning code
2016-01-16 10:06:07 -05:00
Drake Arconis
2f2e1fbe8f
Major breaking changes
2016-01-16 08:05:47 -05:00
Drake Arconis
05ec61d0b0
Banish this file
2016-01-16 04:11:35 -05:00
Lirusaito
aa250836f6
[Radar] Fix title not updating properly all the time
2015-11-26 09:25:38 -05:00
Lirusaito
e395d2fdf8
[Radar] Fix the "people not being removed from radar" problem
...
We'll now make sure expired avatars are not elsewhere in the world(a different visible region) when we remove them
View without space changes.
2015-11-26 08:47:15 -05:00
Lirusaito
ba68d2e231
Remove duplicate windlightses
2015-11-24 12:08:43 -05:00
Lirusaito
c28b241c69
Merge branch 'master' of git://github.com/siana/SingularityViewer
2015-11-20 07:24:30 -05:00
miKaぴょん
4d8f75fb32
Translate German doubleclick autopilot setting
2015-11-20 00:54:53 +01:00
miKaぴょん
8dfeeee231
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2015-11-20 00:18:22 +01:00
miKaぴょん
bc838629d9
Pass screen coordinates on folder item drag events
...
Thanks Lirusaito for guiding me while trying to
find this.
2015-11-20 00:11:54 +01:00
Lirusaito
110faf188b
Blorgysh
2015-11-17 21:07:14 -05:00
Siana Gearz
c358ffe8e2
Fix QueryPerformanceCounter eating more than half the CPU on AMD Win-x86_64
...
The issue was in fast timers, making the naming highly ironic.
Rewrote to use RDTSC intrinsic. Doubled the framerate.
2015-11-18 00:55:11 +01:00
Lirusaito
475de32aea
[Radar] Fix instances where avatars leave but remain on the radar.
2015-11-17 05:59:23 -05:00
Lirusaito
46fa98419c
Using pointers instead of references is so uncool.
2015-11-17 05:54:40 -05:00
Lirusaito
16daa6850e
Finish adding AutoPilot to preferences (my bad!)
2015-11-16 23:40:54 -05:00
Lirusaito
a9eb118897
Sync with upstream alchemy in removing the Lag Meter Floater
...
Useless floater, full of opensim drama we'll have no part in.
2015-11-16 23:40:43 -05:00
Inusaito Sayori
6cd64783f1
Repack darwin glod package for case-sensitive fs
2015-11-14 16:14:18 -05:00
Lirusaito
5485c8263e
Fix typo causing linux crash.
2015-11-13 20:28:34 -05:00
Lirusaito
2207a7c6b1
Feature restore request: Allow removing from outfit from any folder height.
2015-11-13 20:24:18 -05:00
Damian Zhaoying
96a851993e
Add new strings translations and fix some visual strings and buttons en IM floaters
2015-11-13 13:23:43 -05:00
Lirusaito
73916e6483
For testing UI without logging in, add Load from XML... to Advanced menu of login.
2015-11-13 13:07:01 -05:00
Lirusaito
701f53e8e6
It appears I forgot to include the Accordion textures in a commit.
2015-11-13 13:06:49 -05:00
Lirusaito
855e1d9caa
Add Double-click Autopilot option to System->General preferences.
...
Translators:
Nomade: Please review the french System->General and make sure it reads properly
Damian: Please take care of translating panel_preferences_ascent_system.xml
miKa: Please update the translation of panel_preferences_ascent_system.xml so it reads properly.
2015-11-13 13:06:33 -05:00
Lirusaito
966be89d98
Fix Mac not packaging with fmod and therefore exploding.
...
if configuration (set by CMAKE_CFG_INTDIR) is '.', we now fallback on buildtype in viewer_manifest.py
2015-11-10 20:28:40 -05:00
Lirusaito
38eac50597
Fix Land Group info button being forty pixels too high.
...
Thanks for letting us know, Pure Bluestar!
SV-1978 #close Foxed it~
2015-11-09 04:47:51 -05:00
miKaぴょん
6be5a24d5e
Draw physics shapes instead of black screen.
2015-11-02 16:48:01 +01:00
Lirusaito
9b18f15655
Fix opensim by modernizing
2015-11-01 10:38:57 -05:00
Lirusaito
9508ed20a7
Ohnoes, FMOD Studio updated to match Alchemy
...
Such Lazy, Wow!
Fixes 404 when building for mac.
2015-10-26 15:40:35 -04:00
miKaぴょん
1f5a6bb6b6
Disable vertical tab resizing over maximum width
...
In some situations, the label of tabs changes which caused the tab to
resize.
For example, when using vertical tabs for instant messages in combination
with "Display Names (w/Username)" for chat tabs, the display name does not
instantly load sometimes (when not in the avatar name cache?) and the
username is set. After the display name loads the tab label is set to the
display name which triggered a resizing of the tab and could cause it to
overlap the chat box.
2015-10-14 20:48:23 +02:00
miKaぴょん
2bf0a912fb
Add German translation for Tab tooltips
2015-10-06 11:18:26 +02:00
Inusaito Sayori
897e175d3c
Make Linux happy. And finish FIXME in tabcontainer to remove hardcoded strings.
...
Translators: Please translatetab_tooltip_prev and tab_tooltip_next in strings.xml
2015-10-05 22:14:10 -04:00
Inusaito Sayori
bc0709b9c6
More work on accordions, let params do lluiimages like upstream
2015-10-05 15:08:48 -04:00
Inusaito Sayori
ed701f9c88
Compiler fixies
2015-10-05 15:08:47 -04:00
Inusaito Sayori
79a179f569
Do accordions now, too.
2015-10-05 15:08:45 -04:00
Inusaito Sayori
f62c2beb1a
Fix massive vertical rezplats, oops.
...
Thanks for pointing this out Router.
2015-10-05 15:08:44 -04:00
TighMacFanatic
c563e79c55
Fixed hitting cancel on bump map textures removing the texture that was already there.
2015-10-05 15:08:42 -04:00
miKaぴょん
fa07fcf5a7
Set tooltip for vertical tabs
2015-10-05 17:50:35 +02:00
miKaぴょん
1c40bcf63d
Do not steal focus from LSL script error console
...
When selecting a list item in the script error console the focus was
moved to the script text editor. Errors could only be copied with the
keyboard shortcut while clicking and holding the mouse on a single item.
The output can now be selected to allow copying with keyboard shortcuts
(CTRL-C) and (multiple) selection like any other list (CTRL + left mouse
or CTRL-A).
2015-10-05 17:32:19 +02:00
miKaぴょん
890d1f91ff
Try to follow coding conventions
...
Some tiny changes as requested:
- Changed loop bracket style
- Cleaned up the loop for more readability
- Using a const_interator
- Removed NULL check
2015-09-27 06:12:12 +02:00
miKaぴょん
8fbce02226
Remove all selected entries from asset blacklist
...
Previously, the "Remove" button in the asset blacklist floater removed
the last clicked-on entry only - even when selecting multiple rows (by
holding CTRL and clicking on entries).
This behaviour is unintuitive and tedious when trying to selectively
remove multiple entries.
The feature was requested in the group chat. Tested both removing a
single entry and multiple entries with two different avatars on Linux.
2015-09-23 19:03:17 +02:00
Siana Gearz
62a7704a4f
You shaved 2 minutes off compile time...
...
... but you are still hungry
2015-09-18 04:29:38 +02:00
Inusaito Sayori
eaf790c118
Fix warning due to pettiness
2015-09-11 17:43:01 -04:00
Inusaito Sayori
e9429b382d
Alchemy's "Temp fix some breakage and a crash" by Drake Arconis
...
Fixes that mesh issue.
2015-09-11 17:26:46 -04:00
Inusaito Sayori
feb09158ec
FMOD Studio update to 1.06.09 (1.06.07 on Linux32)
...
Fixes the messed up sound issues we've been having with 1.06.01 (and maybe before?)
2015-09-11 17:26:34 -04:00
Inusaito Sayori
b21dbc46bb
Cleanup cof_pending code and attempt to restore old bodypart adding behavior.
2015-09-11 17:26:24 -04:00
Inusaito Sayori
bb4109f982
Fix Tried to access singleton 19LLFloaterAvatarList from singleton constructor!
...
SV-1979 #resolve
2015-09-04 15:43:39 -04:00
Inusaito Sayori
21729724a7
Fix teleport commands that are local not being done properly. - Alchemy Sync
2015-08-24 22:21:49 -04:00
Inusaito Sayori
a67b992216
Hack around hover object bug until we upgrade from llhoverview wholesale.
2015-08-15 20:53:58 -04:00
Inusaito Sayori
269903ff75
Sync lltoolpie, fix the boogs.
2015-08-15 00:48:04 -04:00
Inusaito Sayori
1ff4094467
Hack around opensim having completely broken folder types. (by Drake Arconis)
2015-08-14 19:26:56 -04:00
Latif Khalifa
b780878a55
Be more portable.
...
UINT and DWORD to U32.
Fixes non windows builds.
2015-08-13 06:29:37 -07:00
Inusaito Sayori
46db0d8d50
Sync llviewermedia with alchemy.
2015-08-12 20:09:21 -04:00
Inusaito Sayori
b16058dc83
Remove no-link support more.
2015-08-12 20:08:43 -04:00
Inusaito Sayori
9c06d76b1e
[Opensim] Add suitcase stuff, thanks Cinder!
...
Conflicts:
indra/llinventory/llfoldertype.cpp
indra/llinventory/llfoldertype.h
indra/newview/llviewerfoldertype.cpp
2015-08-12 15:01:23 -04:00
Inusaito Sayori
773a2a3855
There are no grids that don't support links.
...
Conflicts:
indra/newview/llinventorybridge.cpp
2015-08-12 14:58:42 -04:00
Inusaito Sayori
383cd45432
Warning fixies.
2015-08-12 14:57:17 -04:00
Inusaito Sayori
5ac64dfa96
decap
2015-08-12 14:55:14 -04:00
Inusaito Sayori
cfe82e7f1f
Linux is not Windows...
2015-08-12 14:55:09 -04:00
Inusaito Sayori
3888bfee18
Include platform version with platform.
2015-08-12 14:55:01 -04:00
Inusaito Sayori
9dadc8c054
Warnings fixes, mostly signed/unsigned mismatch
2015-08-12 14:54:49 -04:00
Inusaito Sayori
dfa40d8939
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2015-08-12 14:52:52 -04:00
Inusaito Sayori
e797a5eb0e
Fix owner names being cut off in About Land floater
...
SV-1930 #resolve
2015-07-27 19:08:50 -04:00
Inusaito Sayori
3c69f34b2f
Fix duplicate notification templates
...
Thanks for pointing this out, MiVo.
2015-07-27 19:08:45 -04:00
Inusaito Sayori
31867a8bbf
Alchemy crouch toggle code sync.
2015-07-27 19:08:37 -04:00
Inusaito Sayori
fd5dae59ae
Stop hurting my feelings, gcc, I try so hard and you just don't seem to care.
2015-07-23 14:41:53 -04:00
Inusaito Sayori
8543405219
GCC blahblah
2015-07-23 14:36:27 -04:00
Shyotl
25fbeb2080
Resolve compilation errors when building under RelWithDebInfo configuration.
2015-07-23 03:06:17 -05:00
Inusaito Sayori
56ea5b27fd
haisujs axune padoxcunal aerngralt
2015-07-23 03:34:42 -04:00
Shyotl
e335848169
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2015-07-23 01:48:45 -05:00
Shyotl
09f3376259
Apparently there's some poor branch prediction behavior with various gcc versions. Apply tweak from v3 in assert_glerror().
2015-07-23 01:39:50 -05:00
Shyotl
0b6e69de7e
Better handling of texture filtering in deferred post-process passes. TODO: Investigate incorrect fxaa behavior when resolution divisor isn't 1.0.
2015-07-23 01:38:03 -05:00
Shyotl
f5fcf385e4
Experimental disabling of adding/removing wearables when link-creation/old-link-deletion is still pending a response from the server.
2015-07-23 01:35:58 -05:00
Shyotl
22b12223ef
Manual swizzling of textures when in coreGL mode incorrectly overrode pixel pointer just prior to copying to to scratch buffer.
2015-07-23 01:33:28 -05:00
Shyotl
3fc035f568
Trivial cleanup of removal of translation component from transformation matrix when drawing cubemaps.
2015-07-23 01:30:31 -05:00
Shyotl
b2065b43a5
Added new preprocessor flag 'NO_CWDEBUG'. Excludes cwdebug.h from linden_common.h if set, as cwdebug inclusion complicated unit testing.
2015-07-23 01:29:26 -05:00
Shyotl
dbd1eb0d68
Apply occlusion refactor.
2015-07-23 01:24:12 -05:00
Shyotl
dedd75dc4f
Implement all aisv3 HTTP requests. Added PATCH and COPY methods.
2015-07-23 01:02:02 -05:00
Inusaito Sayori
1a6e99a9e3
Sync with Alchemy to go from keys.ini to keys.xml
2015-07-22 01:53:42 -04:00
Inusaito Sayori
4c0038a8ec
Hi xuiparser!
2015-07-22 01:49:18 -04:00
Inusaito Sayori
8d76b798c9
Fix a crash that was possible when teleporting without quick settings having been opened.
2015-07-21 03:59:31 -04:00
Inusaito Sayori
47d9c6d0b5
Revert "More unicodification to fix JP"
...
This reverts commit 7ee66bebe2 .
Damn thing breaks diffing.
2015-07-21 03:58:27 -04:00
Inusaito Sayori
defb530e8b
Revert "Change llavatarname.h to unicode to kill linker warnings when using Japanese codepage."
...
This reverts commit f2e57d72ef .
2015-07-21 03:55:39 -04:00
Inusaito Sayori
0b70603a0c
Tweak removeWord code to make it work for text editors and make more sense
2015-07-17 22:07:35 -04:00
Inusaito Sayori
3d1d138074
[RLVa] includes cleanup by kitty
2015-07-17 22:06:30 -04:00
Inusaito Sayori
bb2537dbaf
Fix Issue 1960: Wrong positon display in mouselook
2015-07-16 17:14:05 -04:00
Inusaito Sayori
7ee66bebe2
More unicodification to fix JP
2015-07-16 15:16:46 -04:00
Inusaito Sayori
f2e57d72ef
Change llavatarname.h to unicode to kill linker warnings when using Japanese codepage.
...
Yeah, I've been playing those anime games lately...
2015-07-15 23:22:25 -04:00
Inusaito Sayori
770f46157b
[Radar] Correct a flaw in which initialization of the avatar list would just be a refresh of the gui
...
Without first populating the list, this was pretty much nothing doing, now the list will populate initially.
Previously, it could be that opening and closing the radar (when not in announce even when closed mode) would yield an empty radar should the sim have been stingy or the connection been rather latent.
2015-07-15 23:00:44 -04:00
Inusaito Sayori
0843505fae
[Radar] When opening, refresh the avatar list gui
...
Normally we cut back on refreshAvatarList calls to avoid work when not visible.
When we reopen, there needs to be a call to refreshAvatarList so the user isn't waiting for position updates to see correct data.
2015-07-15 22:06:10 -04:00
Inusaito Sayori
a4e732da5f
[Radar] Stylistic opts.
2015-07-15 21:51:48 -04:00
Shyotl
2b9245ba2e
Nullptr crash fix that has been sitting unstaged for too long.
2015-07-13 15:09:15 -05:00
Shyotl
d8207424fa
Removed LLUpdateAppearanceAndEditWearableOnDestroy. Use LLUpdateAppearanceOnDestroy + edit_wearable_and_customize_avatar callback.
2015-07-13 15:08:32 -05:00
Shyotl
7a5cd5b659
Have removeCOFLinksOfType also immediately update local inv. Also have it support callbacks (Although unused in singu.)
2015-07-13 15:06:35 -05:00
Shyotl
18ac6dcb60
Fix 'Wear' action if a wearable of that asset id is already worn; option should now be disabled if there's already a worn wearable with a matching assetid that would NOT be replaced by said 'Wear' action. (It should work otherwise).
2015-07-12 02:35:14 -05:00
Shyotl
4cce1f73c8
Remove llwarns spam on rightclick of bodypart in inventory. Also, disabling 'add' option if group selected wearables would exceed wearable limits should not in any way override visibility of that option.
2015-07-12 02:08:14 -05:00
Inusaito Sayori
5e71af2ed7
control_name here caused the server to be spammed and throttle us.
2015-06-29 08:34:24 -04:00
Inusaito Sayori
d8389e6fa7
Don't be retarded, LL.
...
Thanks to Drake Arconis for pointing this out.
2015-06-28 10:04:06 -04:00
Shyotl
865ab0572d
Missed some c++11 bits.
2015-06-27 02:55:22 -05:00
Shyotl
3f3ead0988
Merge branch 'master' into AISv3-WIP
...
Conflicts:
indra/newview/llinventorybridge.cpp
2015-06-27 01:30:28 -05:00
Shyotl
a380161283
Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045
2015-06-26 20:59:31 -05:00
Shyotl
1e488fef6d
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
...
Conflicts:
indra/newview/llviewerregion.cpp
2015-06-26 20:38:43 -05:00
Inusaito Sayori
c6672b3347
Address Issue 1954: OnlineStatus in groups general tab (with OpenSimulator)
2015-06-26 21:38:34 -04:00
Inusaito Sayori
e5c0a362d7
Clean up stupidity in floatertools
2015-06-26 04:54:22 -04:00
Shyotl
4d61305095
GCC fixup.
2015-06-26 01:40:01 -05:00
Shyotl
18c6330af7
Remove unused index_array pointer in LLFace::renderElements and LLFace::pushVertices
2015-06-25 20:24:25 -05:00
Shyotl
af81f692de
Remove superfluous check in llfontgl.
2015-06-25 20:21:33 -05:00
Shyotl
ada7e3ca30
Make clang happier.
2015-06-25 20:19:55 -05:00
Shyotl
41357e579a
Missed LLError::LLCallStacks::cleanup call on shutdown.
2015-06-25 20:19:26 -05:00
Shyotl
9f10d9510d
Initial AISv3 merge. New HTTP messages not plugged in yet.
2015-06-25 20:16:30 -05:00
Inusaito Sayori
1368cd6816
Fix that thing that spammed Nomade.
2015-06-25 03:07:04 -04:00
Inusaito Sayori
b3b2da1428
[Radar] Reroute some code, optimize silly stuff away.
...
No more dead state, death is instant when you disappear
No more dependency on frame or life time, updates come from the sims.
No need to rate control anymore, ui removed.
RIP: My headphones, you were shortlived, but you served my ears well.
2015-06-25 02:57:48 -04:00
Inusaito Sayori
fdab6d0efb
[RLVa] - changed : reimplemented the @adjustheight command using LL's new hover functionalit
2015-06-24 21:44:59 -04:00
Inusaito Sayori
91029955f6
In some cases, one may have modular outfits, added to each other; let it be so!
2015-06-19 22:46:56 -04:00
Inusaito Sayori
990b5f9bb4
Linux Build Foxes
2015-06-19 19:55:56 -04:00
Shyotl
09f4528bfb
Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.
2015-06-19 18:27:21 -05:00
Inusaito Sayori
8f2c92d198
Fix warnings.
2015-06-19 17:28:09 -04:00
Inusaito Sayori
b11511b7b9
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/lldrawpoolwlsky.cpp
2015-06-19 05:42:49 -04:00
Shyotl
1c627317ec
No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.
2015-06-19 03:54:20 -05:00
Inusaito Sayori
2bd2a7a64b
Sync with upstream to refix Issue 1946: Unable to view other Group Land info with Admin mode under builds 6xxx+
...
LL reverted a change they made during viewer-tiger, apparently. Silly LL.
2015-06-18 23:52:36 -04:00
Inusaito Sayori
0965bc576c
Port alchemy fixy: Make the radar not spam the end-user on teleport
...
Thanks to Sim Federal of Alchemy Viewer Team
2015-06-18 23:52:26 -04:00
Inusaito Sayori
6b20a85071
Select Texture=>Select Face
2015-06-18 23:08:41 -04:00
Inusaito Sayori
fd070315e9
Fix Issue 1945: llListStatistics not recognized as a function
2015-06-11 19:48:20 -04:00
Inusaito Sayori
b3709a0343
Woops, unused variable!
2015-06-11 08:39:29 -04:00
Inusaito Sayori
b35d1b7005
Accept and respect Opensim's login response with "classified_fee" (otherwise assume 0 for opensim)
2015-06-10 13:47:06 -04:00
Inusaito Sayori
aad24fa5c5
Solve Issue 1944 by allowing classified fees >= 0 on opensim
...
Opensim really needs to broadcast minimum classified fee...
Meh, guess they'll have to enforce that on the server...
2015-06-08 09:26:22 -04:00
Inusaito Sayori
a0fb5cdaa7
[RLVa] Hide avatar-render-specific ui for people who are out of camavdist
...
Hides lookat lines, nametags, and overhead voice indicators for hidden avs.
While this isn't necessarily according to spec, this keeps the ui from looking out of place with no avatar to show with it
View without space changes? Meh, doesn't matter so much.
2015-06-04 12:21:49 -04:00
Inusaito Sayori
9f388fd7b8
[RLVa] If name or nametag restricted, camavdist restricted, rangefinder can only see within the limited distance.
...
(or in iff_range, if that's lower)
2015-06-04 09:51:35 -04:00
Inusaito Sayori
96e88b97ef
[RLVa] When trapped in mouselook, avoid potential glitches and excess work if reset_view_final is called
2015-06-04 09:37:59 -04:00
Inusaito Sayori
63b67d62ef
[RLVa] Fix things that weren't working (new commands with params)
...
Code cleanup, better word a comment or two
Don't claim to support camdraw* or camtextures commands until we actually do
2015-06-04 09:35:59 -04:00
Inusaito Sayori
e7a0867cf3
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2015-06-04 03:25:46 -04:00
Inusaito Sayori
e956b7da51
You threw your arms around us, in the hopes we wouldn't change
...
But we had to change some.
2015-06-03 18:13:26 -04:00
Shyotl
283f5298d5
Missed a line. This assert should only be evaluated when running in deferred.
2015-06-03 12:46:37 -05:00
Inusaito Sayori
2d6a400967
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2015-06-02 04:45:31 -04:00
Shyotl
0688cda8d2
More thorough VBO teardown in resetVertexBuffers/stopGL. Also, found cases where gGL.init failed to be called when it should have been.
2015-06-01 17:58:19 -05:00
Shyotl
142322528c
Use LLColor4U::white instead of LLColor4::white when assigning as vertex color.
2015-06-01 16:56:24 -05:00
Shyotl
7a9a4f3e1e
Local light setting toggle behavior was incorrect with shaders enabled.
2015-06-01 16:54:36 -05:00
Shyotl
d140d28af9
Tangent vecs aren't needed for non-deferred bump pas. Omit unless deferred is enabled.
2015-06-01 16:53:29 -05:00
Shyotl
f2883801ec
Harden context recreation texture handling.
2015-06-01 16:38:25 -05:00
Shyotl
c965df0901
3d perlin noise was not generating proper results.
2015-06-01 16:36:35 -05:00
Inusaito Sayori
1d2daaae71
[RLVa] @camunlock means no flycamming away from the avatar!!
2015-05-26 20:14:45 -04:00
Inusaito Sayori
46e9d874e0
[RLVa] Implement guts of @camdraw*
2015-05-26 07:51:05 -04:00
Inusaito Sayori
a9fd9e6f2a
[RLVa] Cleanup for the last commits
...
camAvDist, camMax and camMin are now combined into:
-camPole: returns the saved pole of the highest degree
-updatePole: updates the saved pole to the highest degree when the related exception is changed
Poles are now cached in a map called m_Poles in the RlvHandler.
2015-05-26 07:50:21 -04:00
Inusaito Sayori
75ba6cc67d
[RLVa] @camdistmax, @camdistmin
...
This needs testing, this all needs testing...
but hey, at least it's here, right?
2015-05-26 06:16:28 -04:00
Inusaito Sayori
1720f2ebe4
[RLVa] @camzoommax, @camzoommin
...
Reload current saved zoom for clamping when imposing this restriction, whether that be mouselook zoom or regular.
Also some code cleanup.
2015-05-26 05:34:05 -04:00
Inusaito Sayori
9616a43cb0
[RLVa] Implement core of @camdrawcolor, without actually hooking it up.
2015-05-26 02:50:24 -04:00
Inusaito Sayori
c42e501f6f
[RLVa] @camavdist
2015-05-26 02:49:23 -04:00
Inusaito Sayori
210c97986d
[RLVa] Rlv Options can be floats or LLColor3s too now.
2015-05-26 02:35:40 -04:00
Inusaito Sayori
323b49de17
[RLVa] @camunlock
...
Causes LLAgentCamera::unlockView() to not happen, this turns off camera orbits.
Enables sim camera constraints regardless of user preference.
Resets camera when turned on.
2015-05-26 01:05:37 -04:00
Inusaito Sayori
d81497d29f
[RLVa] Skeleton for implementation of RLV 2.9 features.
2015-05-25 19:52:35 -04:00
Inusaito Sayori
e2347651e9
I dunno what this is... Code clean up? Sure.
2015-05-25 15:40:15 -04:00
Inusaito Sayori
dcb349d55d
Satisfy Issue 1932: Totalgroup member count
2015-05-25 15:37:31 -04:00
Inusaito Sayori
5be98205d4
[RLVa] Allow offering calling card when name restricted.
...
Also cleanup dumb old code around this area
2015-05-25 14:27:50 -04:00
Inusaito Sayori
e7f4a1d5a2
Cure us of Issue 1931: UI Cleanup - Stacked Notice Windows
2015-05-25 14:26:33 -04:00
Shyotl
a7ba5145cc
Inline shader uniform setters, and cache values in vectors instead of maps. Also, deleted mUniformNameMap, mUniformNameMap, and uniform2i, as they were unused.
2015-05-23 17:16:02 -05:00
Shyotl
d4a56c6d94
Toss attachments into their own bridge that sets their type to TYPE_AVATAR, and use generic bridge for plain old 'active' volumes. Resolves issue where non-attached ACTIVE flagged linksets would be included in the avatar render type, and thus would vanish when such type was disabled.
2015-05-22 16:14:57 -05:00
Inusaito Sayori
36347aba83
[RLVa] Censor Report Abuse floater
...
This shouldn't matter because it only censors the ui elements, everything else the floater sends is untouched, ids and actual name variables...
It annoyed me that pie menu could work around @shownames and @shownametags restrictions.
2015-05-22 16:53:43 -04:00
Inusaito Sayori
4f8cbb8c06
[RLV] 2.9: @shownametags
...
This hides name tags and names whenever possible, except from chat.. when not possible, falls back on anonyms
Changed: Radar no longer hidess based on @shownames, that's silly.. now radar hides names when @shownames
Radar will alert when @shownames restricted, but not when @shownametags restricted
Radar will not offer menu when @shownames or @shownametags restricted, and the IM and Profile buttons will disable.
Hopefully fixed broken RLVa logic in llfloaterobjectiminfo.cpp
Fix slightly broken RLVa logic code in llpanelpermissions.cpp
Changed: Range Finder now disallowed when minimap disabled, show loc restriction doesn't change it anymore.
Fix broken hiding of names when offering teleports; rlv_shownames param doesn't seem to always pass, work around those situations...
^-This causes some false positives, I suppose, if you offer teleport from friends list to someone in the region, but better safe than sorry.
2015-05-22 16:53:32 -04:00
Inusaito Sayori
aa1e0ce067
Feature Request: Add option to hide own look at beacon(from Alchemy)
...
Option is in System->Security & Privacy, at the top with the rest of the lookat options.
Syncs llhudeffectlookat with Alchemy
2015-05-20 21:09:56 -04:00
Inusaito Sayori
eec85de620
Allow operating with linked folders as though they were mostly folders, show clipboard menu entries on all folders (except COF)
...
Paste pastes into the linked folder, you've been warned.
2015-05-20 13:19:57 -04:00
Inusaito Sayori
03f2192684
At the request of Aleeri in group, add support for EXP-901
...
Notifies nonfriends when their chat is blocked
This is instead of showing the muted autoresponse message, so only muted people will see it now.
Also cleans up some excess autoresponder code.
2015-05-20 11:31:28 -04:00
Inusaito Sayori
078a6980b9
Feature: Find on Map from IM floater's flyout menu.
2015-05-19 11:49:35 -04:00
Inusaito Sayori
1fcb478a2a
Offer Sit on away option in World->Status submenu.
2015-05-19 06:59:28 -04:00
Inusaito Sayori
9e482bcb22
Correct Issue 1925: Dark Skin Group Notice Window
2015-05-19 06:59:04 -04:00
Inusaito Sayori
2bb4df78ad
Fix block conference options not being selectable from preferences.
...
Thanks to Nomade Zhao for pointing this out!!
2015-05-19 06:58:18 -04:00
Inusaito Sayori
63d7e18456
Selectable cloud textures (from Alchemy)
...
Option is in Clouds tab of the Advanced Sky Editor.
2015-05-19 06:57:26 -04:00
Inusaito Sayori
9ed99176f7
Fix combo boxes with control_names not starting with the right value.
...
TODO: Fix the existing workarounds all everywhere... mostly in prefs.
2015-05-19 06:53:06 -04:00
Inusaito Sayori
38983e30fb
Cleanup code a bit in snapshot floater and make stuff look nicer there too.
2015-05-19 06:39:25 -04:00
Shyotl
af020ad558
LLViewerShaderMgr::setShaders() should be called unconditionally upon restoreGL.
2015-05-18 15:36:50 -05:00
Shyotl
55e3ddb465
Can't you just be happy GCC? It's all I've ever wanted.
2015-05-18 14:02:39 -05:00
Inusaito Sayori
b7f2d741e7
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2015-05-16 04:13:11 -04:00
Shyotl
690f3614c1
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
...
Conflicts:
indra/llrender/llpostprocess.cpp
2015-05-16 02:53:19 -05:00
Shyotl
f827d77600
Verify CoInitialize call was successful (on Windows only).
2015-05-16 02:31:32 -05:00
Shyotl
48c0c6eb39
Format specifier %zu is invalid with visual studio. Use %Iu for that platform, instead.
2015-05-16 02:31:16 -05:00
Shyotl
966c5aa409
Remove redundant methods of checking if shaders are enabled. Just use LLGLSLShader::sNoFixedFunction.
2015-05-16 02:31:06 -05:00
Shyotl
2131067436
LLPerlin #include cleanup.
2015-05-16 02:30:57 -05:00
Shyotl
aa9cc7a50d
Fixed div-by-zero issues in LLStat.
2015-05-16 02:30:36 -05:00
Shyotl
8943439629
Remove dupilicate perlin noise impl, and update the remaining one.
2015-05-16 02:30:32 -05:00
Inusaito Sayori
2c1f1255fa
FMOD Studio 1.06.01
2015-05-15 16:15:54 -04:00
Inusaito Sayori
f79b28117d
translate preview flyout_button where button was previously translated.
2015-05-15 06:34:24 -04:00
Inusaito Sayori
173de071f6
There is no wind under water.
2015-05-15 03:51:57 -04:00
Inusaito Sayori
a4da61ae0b
Ease up enable_move and enable_rotate restrictions in object tab of build tools.
...
Also cleans up duplicate logic
Explanation and Justification:
Move permission is needed to rotate and move
Move and rotate are actions you can perform via manip tools on attached linked prims already
This just enables the GUI controls for something that was already doable via other means such as mouse.
2015-05-15 02:07:35 -04:00
Inusaito Sayori
580a7a4599
Additional buttons was pushing text off the edge of area search, refresh and stop are now icons.
2015-05-15 01:07:57 -04:00
Inusaito Sayori
d02df9e451
Can minimize the local chat floater.
2015-05-15 01:06:31 -04:00
Inusaito Sayori
4e4dbd4012
Satisfy Issue 1916: Local Gesture Preview/Play
...
Adds a dropdown option to gesture preview button to preview locally.
Note that any chat commands in gestures will still work as they normally would!
Translators: do your thing or hold your peace. (floater_preview_gesture.xml)
These code changes will look nicer viewer without space changes~
2015-05-14 23:55:20 -04:00
Inusaito Sayori
8e05524027
Add TP and Look options to area search (happy now?)
2015-05-14 11:22:36 -04:00
Inusaito Sayori
67836ecf67
Actually, show the blue warning, it's intentional, it's only a warning..
2015-05-14 09:31:15 -04:00
Inusaito Sayori
a974ca096c
Allow setting the label of a flyout button dynamically in code.
2015-05-14 07:30:49 -04:00
Inusaito Sayori
361d3542a4
Fix that blue warning that annoyed Nomade.
2015-05-14 04:59:53 -04:00
Inusaito Sayori
1db2ffe02b
Feature Request: Allow blocking conferences from nonfriends exclusively.
...
Option is in Communication tab, as the old one was.
Translators will need to localize this. (panel_preferences_im.xml)
2015-05-12 18:00:14 -04:00
Inusaito Sayori
235693f134
You're all so special.
2015-05-12 09:13:44 -04:00
Drake Arconis
1e0243aa3d
Fix some 64bit-unsafe windows code
2015-05-12 09:11:59 -04:00
Inusaito Sayori
2631ae91e7
Sync notifications with upstream to fix Issue 1913: Unable to log in. ERROR
2015-05-07 09:33:30 -04:00
Inusaito Sayori
e71d94aa69
Words lie. People lie. The land tells the truth.
2015-05-05 20:35:01 -04:00
Inusaito Sayori
4b96251852
This is why we can have nice things.
2015-04-24 23:57:29 -04:00
Inusaito Sayori
193fc27ba2
Issue 1836: Autoresponse Improvement, adds World->Status->Autoresponse submenu
...
Moves Fake Away, Busy, and Away into a submenu of World called Status, from upstream.
Tweak to LLView::findControl to work with per account controls too.
TogglePerAccountControl added for when a control a menu is using is not in the main group.
2015-04-24 23:41:19 -04:00
Inusaito Sayori
a6ae79f9b1
Stylistic changes and whatnot for LLDropTarget what with setValue and setItem
...
Conflicts:
indra/newview/lldroptarget.h
2015-04-24 19:15:17 -04:00
Inusaito Sayori
9ce9a1f472
LLDropTarget::mEntityID=>LLDropTarget::mID
2015-04-24 18:27:01 -04:00
Inusaito Sayori
b9a6fb8468
In pay floaters, display proper currency symbol on non-SL grids.
2015-04-23 23:56:01 -04:00
Inusaito Sayori
2cfc90736d
Foxes don't have bedtimes.
2015-04-23 06:31:32 -04:00
Inusaito Sayori
886a05549d
Fix alignment of Text Chat Preferences; bottom_delta > bottom
2015-04-19 19:26:51 -04:00
Inusaito Sayori
9f06333a86
Address Issue 1897: Pressing letter keys STARTS local chat
...
Option lives in Text Chat preferences. "Letter keys start typing into local chat"
Code is from upstream..ish
2015-04-19 18:59:17 -04:00
Inusaito Sayori
b28e4e06ae
refresh_desktop_app_entry.sh lives in etc/ now, missed that spot.
...
Thanks to H-H-H for pointing this out.
2015-04-19 18:09:40 -04:00
Inusaito Sayori
8b7b0649a8
Uncomment use of etc/ for spawnWebBrowser on Linux, now that we use etc/ for scripts.
...
Thanks to H-H-H for pointing this out.
2015-04-19 18:08:49 -04:00
Inusaito Sayori
be41d8f734
Getting possessive
2015-04-18 13:11:13 -04:00
Inusaito Sayori
036d5b84d1
UseHTTPInventory can never be turned off on SL anymore.
2015-04-07 18:37:34 -04:00
Inusaito Sayori
f514243c1b
Make /regionsay fall back on normal chat pipes
2015-04-04 15:47:20 -04:00
Inusaito Sayori
0d27d0cbc7
Inventory decline notifications are annoying, add LogInventoryDecline from upstream.
...
View without space changes please~
2015-04-04 15:31:39 -04:00
Inusaito Sayori
744def3c1f
French Translation updates~ Thanks Nomade!
2015-04-01 01:54:46 -04:00
Inusaito Sayori
e73ebfdb76
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2015-03-25 17:39:15 -04:00
Inusaito Sayori
eb0247d27a
Revert "[STORM-2109] Apply fixes from Brett Joseph of Vivox", this doesn't seem ready yet.
...
This reverts commit 0681b88cbc .
2015-03-25 08:18:32 -04:00
Inusaito Sayori
eefa0957ab
Minor tweak to a label
2015-03-25 08:05:50 -04:00
Inusaito Sayori
9d8028009e
French translation pokings from Nomade
2015-03-25 08:05:07 -04:00
Inusaito Sayori
398014b118
Port Hover Height from Alchemy, it's in quicksettings~
...
Lots and lots of other sync~
Also has a command /hover
Added /resync command from Alchemy.
2015-03-25 08:04:24 -04:00
Inusaito Sayori
a54937b4b8
Don't disable friend right checkboxes forever, thank you~
...
Clean up old/dead code there, too.
2015-03-24 19:39:25 -04:00
Inusaito Sayori
11a3c93ab0
When the user changes cache size in network tab, clear cache too.
2015-03-24 19:24:33 -04:00
Damian
a50ec32474
Update floater_region_tracker.xml
2015-03-22 07:00:57 -03:00
Damian Zhaoying
0dc6bd937d
Add file floater_region_tracker.xml to spanish translation
2015-03-22 06:56:16 -03:00
Damian Zhaoying
b124ca5ad3
Update translations on spanish files.
2015-03-21 22:37:20 -03:00
Lirusaito
abeb12ac75
Missed file, oopsies
2015-03-21 19:09:44 -04:00
Inusaito Sayori
f010120e52
Old Linux Fix
2015-03-21 15:15:22 -04:00
Inusaito Sayori
2b7071f862
Alt-Enter on login screen fullscreening, goodbye, good riddance.
2015-03-21 06:16:04 -04:00
Inusaito Sayori
bd6496fe4a
More linux compile fix.
2015-03-21 06:07:47 -04:00
Inusaito Sayori
a7d3d08057
Linux compile fix, thanks for pointing this out, Ratany.
2015-03-21 05:36:00 -04:00
Inusaito Sayori
de6db7fa5a
Fix the bug in LLFloaterEditUI that caused the width spinner to change the height
2015-03-21 03:48:10 -04:00
Inusaito Sayori
d7c8b00d90
In the Region Tracker Floater, save all selected items when refreshing.
2015-03-21 03:47:21 -04:00
Inusaito Sayori
578e5b7191
Fix wrong child names in world map
2015-03-21 03:46:22 -04:00
Inusaito Sayori
7811d8857c
Port Region Tracker Floater from Alchemy~
...
Added getGridSpecificFile function to append the grid when it's not SL.
Also slightly rearrange Singularity menu.
2015-03-21 03:45:09 -04:00
Inusaito Sayori
27e69cab1e
Support upstream's xui pattern of scroll_list.columns and such.
2015-03-21 00:36:47 -04:00
Inusaito Sayori
72080e79e9
Sync llcommon with Alchemy a bit.
...
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
2015-03-20 22:04:04 -04:00
Inusaito Sayori
16a2b28c1b
Put the two new mouselook settings under Input & Camera tab.
2015-03-19 04:02:32 -04:00
Inusaito Sayori
02c629a0b0
Pick up "AlchemyMouselookInstructions setting and make mouselook instructions useful" from Alchemy
2015-03-19 03:59:27 -04:00
Inusaito Sayori
6cd7941fd2
Feature Request: Offer to show that autoresponse to muted was sent.
...
Also, stop letting RLV filter cmdline_printchat() calls.
2015-03-19 03:37:01 -04:00
Inusaito Sayori
8cc2499f0a
[RLVa] Respect @showloc in IFF
2015-03-19 00:04:12 -04:00
Inusaito Sayori
0681b88cbc
[STORM-2109] Apply fixes from Brett Joseph of Vivox
...
Applies the following commits:
fe982eedd58b5ac91f250f8446dc44dd2624c976 - Better MediaConnect handling of 1026 return status, media already connected.
6d343c74f6cfd456f99bd4bc39fa7a5ef3a1fc50 - More voice related changes to improve the user's experience.
f85263acf3902f2d54e108c4b62fa090e91b2b6e - Added the loop back setting so people can hear themselves during the mic test.
Removes outdated SLim code from llimpanel.cpp
2015-03-18 22:59:44 -04:00
Inusaito Sayori
0367711e93
Fix ascent tag coloring borkage, woops.
2015-03-18 02:10:05 -04:00
Inusaito Sayori
ee8afcb19a
RLVa fixes for shownames
2015-03-18 02:08:41 -04:00
Inusaito Sayori
07a03d17c1
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2015-03-17 01:42:09 -04:00
Damian Zhaoying
e40cee8708
Update spanish translations files and fix some typos.
2015-03-17 02:35:48 -03:00
Inusaito Sayori
242fc85245
Compile on Windows, dude~
2015-03-17 01:27:54 -04:00
Inusaito Sayori
76c314c2ac
For those who haven't changed it, turn the media filter off instead of prompting.
...
This doesn't really matter, and for some weird cases it's reported acting up, so better off that new users don't have to mess with it.
2015-03-16 21:36:59 -04:00
Cinder
ab4e195bb4
Fix search floater title
2015-03-15 10:38:28 -04:00
Lirusaito
be6ad2a919
Add Mouselook IFF from Alchemy!
...
Also Assorted Code Cleanup and sync with Alchemy
Debug Settings are AlchemyMouselookIFF and AlchemyMouselookIFFRange
Look to see if an avatar is in a nearby region always when checking if they're an estate owner.
2015-03-13 22:16:07 -04:00
Inusaito Sayori
f168d6b60a
Apply Aleric's fix to llsingleton.h to fix issues with AISync stuff
...
Modified to diff with LL better.
2015-03-13 16:27:43 -04:00
Inusaito Sayori
585465d8c3
Patch Issue 1850: Graphical anomaly when searching inventory via creator
2015-03-09 18:57:58 -04:00
Inusaito Sayori
9c23439b85
Fix Issue 1849 by adding the missing keys from upstream
2015-03-08 09:09:33 -04:00
Inusaito Sayori
0f7036cb16
Restore Cinder's codesigning Support
2015-03-08 09:08:41 -04:00
Inusaito Sayori
2d690dba45
Fix mispackaging for linux32
...
Thanks to Beware Hax for pointing out the flaw
2015-03-07 08:26:43 -05:00
Inusaito Sayori
e8dd91f98d
Fix a potential bug in LLSpeakerMgr wherein speakers would not be added to group chat participant lists in LOTE
...
Also clean up (static) translated constants for group_member_statuses
2015-03-04 22:27:27 -05:00
Inusaito Sayori
36b8d3f9c9
autoresponse settings are per account, fix sending items to muteds for real, thanks Deltek
2015-02-27 09:33:23 -05:00
Shyotl
8c58a9c276
Oops, these LLFontGL changes are vital and were missed in an earlier commit.
2015-02-27 05:32:29 -06:00
Shyotl
5652a79327
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2015-02-27 05:23:30 -06:00
Inusaito Sayori
6bc47b6e8d
Changes proposed by Cinder, thankies~
2015-02-26 22:57:21 -05:00
Inusaito Sayori
8028423c70
Rework HippoGridManager's parseUrl to be called after LLAppViewer::init
...
No more hangs~
I'm not exactly sure if this exhibits the same behavior it used to, but this doesn't matter because it hasn't worked for versions, probably since AICurl, so no one is relying on it.
It would seem to me that it needs to be called after pumps are created.
parseUrl is now public.
Also, move hippogridmanager.h into AI_UNUSED section of llxmlrpcresponder.cpp, it's part of the unused
2015-02-26 22:57:06 -05:00
Inusaito Sayori
fa83ad8008
Don't disable selecting friends whose friend rights are yet to be updated
2015-02-26 22:56:59 -05:00
Inusaito Sayori
728434e8ef
Feature Request: Allow bulk edit for objects' descriptions and names
...
Translators need to translate the multiple_objects_selected string in floater_tools.xml
2015-02-26 22:56:53 -05:00
Inusaito Sayori
1ce35de4bd
Allow sending inventory without auto-unmuting if Autoresponse for muteds with Inventory Offers is on.
2015-02-26 22:35:52 -05:00
Inusaito Sayori
31124b1b0f
Fix out of order newview/CMakeLists, remove two unused header files
2015-02-26 22:35:20 -05:00
Shyotl
d2468d9f04
Fix issue with rigged normals when not using hardware skinning.
2015-02-25 20:53:14 -06:00
Shyotl
af41a652e4
It's silly that this was necessary... but it was.
2015-02-25 03:04:49 -06:00
Inusaito Sayori
1a06263ac0
Fix Issue 1844: libmedia_plugin_gstreamer mispackaged
2015-02-24 00:48:48 -05:00
Siana Gearz
dc1efa8a05
Fix develop.py for cygwin invocation
2015-02-23 00:35:43 +01:00
Inusaito Sayori
e5b09a0876
Fix bug in which texture drag&drop to a texturectrl wouldn't make apply buttons enable (IE: group profile)
2015-02-16 14:57:28 -05:00
Shyotl
b7454f5f43
Cleanup in llfontgl, as well as more aggressive bounds checking.
2015-02-15 21:45:33 -06:00
Inusaito Sayori
e9a517985b
Instead of "?object_not_owner" display " (Owner)" appended on Object IM Info Floater
...
Translators may want to update floater_object_im_info.xml, string "owner" was added.
2015-02-13 02:56:52 -05:00
Inusaito Sayori
a2058bc1e8
Hopefully fix Router's issue by caching ID for map compare, not name.
2015-02-13 00:01:19 -05:00
Inusaito Sayori
de96b8e43e
Use friendlier names in friendly situations~
2015-02-12 23:46:22 -05:00
Inusaito Sayori
d1e5d67336
What Altivec? This isn't PowerPC
2015-02-12 21:01:24 -05:00
Inusaito Sayori
5279697890
mFocusLostSignal is not needed, these disconnect themselves.
2015-02-11 01:44:26 -05:00
Inusaito Sayori
fd9166e32a
Presentation of group ban date bug go squash.
2015-02-09 17:01:45 -05:00
Inusaito Sayori
6b9c53c3c0
Fix missing ) at the end of llTextBox description tooltip.
2015-02-05 00:38:17 -05:00
Inusaito Sayori
3620e537ab
Satisfy Issue 1827: Group Profile Texture Expansion
...
Also fix buttons laying over Group Insignia text
2015-02-05 00:37:35 -05:00
Inusaito Sayori
e625fa3b33
Cleanup duplicate show_picture codestuffs.
2015-02-04 23:47:37 -05:00
Inusaito Sayori
f0b18e52a3
OR not AND
2015-02-04 13:54:39 -05:00
Inusaito Sayori
adecaca730
Work around crash signature 8715
...
Apparently SL Grid gives some odd session types for P2P?
This should be looked into closer, but for now just accept that it happens.
2015-02-04 01:07:56 -05:00
Inusaito Sayori
10ef3ff683
Fix crash signature 7694
2015-02-04 00:30:40 -05:00
Inusaito Sayori
ef5b95d5b9
Fix crash signature 9141
2015-02-04 00:02:09 -05:00
Inusaito Sayori
c3e9150125
Oops, should leave that there.
2015-02-02 19:28:29 -05:00
Inusaito Sayori
ac0afbcc4a
Fix llDialog tooltip
2015-02-02 16:12:56 -05:00
Inusaito Sayori
a9593e62b7
LLViewerMenu code cleanup
2015-02-02 16:12:32 -05:00
Inusaito Sayori
4b7bc99291
Cleanup LLNotify
...
Adds support for SUPPRESS_TOAST in payload to skip display of notices and just spew them to chat. (this was requested to be hooked up around last release, I think)
Fixes Singularity->Close All Dialogs breaking notifications such that the skip button would appear when not needed.
Cleans up a buncha dead code and silliness.
Also Cleanup LLGroupNotify because why not?
2015-02-02 15:44:06 -05:00
Inusaito Sayori
43e1aa9c01
Apply Aleric's fix for Issue 1810: Import of XML shape data from Avastar
2015-01-31 06:47:24 -05:00
Inusaito Sayori
d44d6515d8
[Voice Update] Use newest SLVoice~
2015-01-30 18:17:06 -05:00
Shyotl
7c636c6c17
Remove unused linear_to_srgb function from several shaders.
2015-01-29 17:49:18 -06:00
Shyotl
c094314a2d
LLFeatureManager cleanup.
2015-01-29 17:48:15 -06:00
Shyotl
9da87128f1
Disable usage of glFog when drawing selected objects, if using shaders.
2015-01-29 17:47:39 -06:00
Shyotl
1036e1f3fb
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2015-01-29 17:40:44 -06:00
Inusaito Sayori
6b5fd054f6
Update all other platforms to FMOD Studio 1.05.11
2015-01-29 06:52:12 -05:00
Shyotl
91b6d68eae
Avoid unix-based mkdir usage on windows.
2015-01-29 04:03:45 -06:00
Shyotl
a0487b12be
FMOD Studio prebuilt update for OSX. Also, delete "autobuild-package.xml" that is in newer v3-based prebuilt packages, and prevent registry key from trumping usage of fmodstudio prebuilt; it must now be explicitly set in the develop.py invocation.
2015-01-29 00:55:08 -06:00
Shyotl
1e07b626c4
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2015-01-28 16:39:39 -06:00
Shyotl
b247ca3f76
Fix osx packaging.
2015-01-28 16:37:06 -06:00
Inusaito Sayori
5f3cac46eb
This slipped by me, oopsies.
2015-01-28 13:12:38 -05:00
Inusaito Sayori
a7c424fc68
Fix remaining issues with new packaging system (mostly Linux)
...
Thanks to Duncan Armundsen and Damian Zhaoying for the pointers
(merges slightly with alchemy)
2015-01-27 12:08:46 -05:00
Inusaito Sayori
a35f159117
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2015-01-27 09:15:01 -05:00
Shyotl
b865b92a6a
Merge branch 'FMODStudio'
...
Conflicts:
indra/cmake/PNG.cmake
indra/newview/llnetmap.cpp
indra/newview/llviewermessage.cpp
PARAMETERS: CLEAN
2015-01-26 17:15:46 -06:00
Shyotl
2132978c41
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2015-01-26 15:26:02 -06:00
Inusaito Sayori
97f6b9d845
Fix missing notification warning pointed out by Nomade and the French testers
...
Merci Beaucoup, tout les monde!
2015-01-26 13:33:31 -05:00
Shyotl
6e4ef6f8a1
I'll have all the derps, please.
2015-01-23 16:49:21 -06:00
Shyotl
56bd48bd2a
elseif (WINDOWS AND WORD_SIZE EQUAL 32)' mistakenly clobbered. Also, try 'ProgramFiles(x86)' envvar first
2015-01-23 02:07:19 -06:00
Shyotl
ca98523c41
Cmake version bump, cleanup, typo fixes, rewrite of fmodex.cmake.
2015-01-22 02:39:45 -06:00
Inusaito Sayori
290f143b5c
Fix the << button on local chat not working, thanks for pointing this out, Nomade~
...
Also code cleanupsies~
2015-01-21 17:21:38 -05:00
Inusaito Sayori
123ded50ef
Oops, that should use emplace, too bad we don't have C++11.
2015-01-20 17:44:22 -05:00
Inusaito Sayori
18b7f6925a
Fix/Update Inspect Tool
...
Solves Issue 1131: Inspect Window while open prevents camming
Possibly fixes Issue 928: Have to Click a second time to Inspect an object, I couldn't reproduce, but maybe you still can?
Fixes a bug in the name cache connection setting of llfloaterinspect.cpp from upstream.
2015-01-20 04:59:46 -05:00
Inusaito Sayori
51aaa9f26b
LLTool Update/Sync
...
Better diff against Alchemy.
2015-01-20 04:37:32 -05:00
Inusaito Sayori
a75964c993
Move menu stuff out of lltoolmgr and into llviewermenu.cpp
2015-01-20 02:00:25 -05:00
Inusaito Sayori
9bd9cb697e
Fix SLVoice erroring when log folder path has a space in it.
...
Thanks to Nomade and Melissa for the help tracking this!
2015-01-13 21:00:57 -05:00
Shibe Doge
4d29117148
Doge wuz here. Also barkies.
...
░░░░░░░░░▄░░░░░░░░░░░░░░▄░░░░
░░░░░░░░▌▒█░░░░░░░░░░░▄▀▒▌░░░
░░░░░░░░▌▒▒█░░░░░░░░▄▀▒▒▒▐░░░
░░░░░░░▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐░░░
░░░░░▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐░░░
░░░▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌░░░
░░▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌░░
░░▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐░░
░▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌░
░▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌░
▀▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐░
▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐░
░▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌░
░▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐░░
░░▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌░░
░░░░▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀░░░
░░░░░░▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀░░░░░
░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▀▀░░░░░░░░
2015-01-13 17:31:20 -05:00
Inusaito Sayori
dd4f2e857b
If we're gonna autologin, remember name too.
2015-01-13 00:52:27 -05:00
Inusaito Sayori
0b998da183
Cleanup stuffs inspired by Drake's work~
2015-01-13 00:50:49 -05:00
Inusaito Sayori
eef7596aeb
Combine renderPhysicsDisplay code loops, but don't actually fix any bugs X3
2015-01-13 00:46:20 -05:00
Inusaito Sayori
4abf23f9a9
[OpenSim] Seriously fix Issue 1791, the names thing.
...
Don't leave me now, don't say it's the end of the road~
2015-01-12 22:07:23 -05:00
Inusaito Sayori
56d2754606
Bricks in the wall
2015-01-12 21:32:29 -05:00
Inusaito Sayori
88ca93d24f
Fix vivox logging borkage.
...
Thankies to Drake/Alchemy~
2015-01-12 19:16:47 -05:00
Inusaito Sayori
72c85ef104
Solve Issue 1234: Enable opening of chat logs in external editor under linux too
...
Requires xdg-open, but meh~
2015-01-12 19:14:53 -05:00
Inusaito Sayori
c6b1763d96
[STORM-1949] Add default values for ExternalEditor
...
Thankies Cinder~
2015-01-12 19:00:44 -05:00
Inusaito Sayori
844444c33b
Optimize loops calling endInstances()
...
Thankies to Drake Arconis/Alchemy~
2015-01-12 18:06:49 -05:00
Shyotl
c708408f64
Linux OSS was removed from fmodstudio. Also fix issue in linux manifest.
2015-01-10 16:11:52 -06:00
Lirusaito
03e9db98e6
[OpenSim] Optimize the minimap region tile matrix implementation
2015-01-10 16:29:23 -05:00
Inusaito Sayori
bf3947dcc5
[OpenSim] Draw property lines on minimap properly for variable size regions
...
This fixes Issue 1684: Minimap on Opensim Var Region showing bad the property lines
This changeset is welcome for use under LGPL.
2015-01-10 12:31:26 -05:00
Inusaito Sayori
5140affe07
[OpenSim] Fix World Map Textures on Minimap of Variable Size Regions.
...
Thanks to Shyotl for the helpies~
2015-01-10 03:01:02 -05:00
Shyotl
b808caaa0e
Appease cmake 3.1.0
2015-01-09 21:38:27 -06:00
Inusaito Sayori
658c617c75
Don't add this column twice, that's just silly.
2015-01-09 17:14:08 -05:00
Inusaito Sayori
05fcfc32bc
[OpenSim] Remove unneeded code from the previous name resolution fixes
2015-01-09 15:57:24 -05:00
Inusaito Sayori
05a4409b3d
Fix display names not being considered default if the display name is sent empty
2015-01-09 14:29:57 -05:00
Inusaito Sayori
cadc08af87
Remove assert for Issue 1784 (crash signature 450), it didn't fail.
...
This reverts commit bb297ac354 .
2015-01-08 15:08:24 -05:00
Shyotl
2678d0f99e
Trying fmodstudio as a prebuilt. (pushed to test on linux buildserver)
2015-01-08 00:49:42 -06:00
Shyotl
b1954e411b
Nice typos.
2015-01-08 00:46:36 -06:00
Inusaito Sayori
5d47c7ecfa
[OpenSim] Properly fix name lookups, oops~
2015-01-07 19:02:28 -05:00
Inusaito Sayori
f09d399e88
Only spam the logs about missing var region flags when we're not on SL.
2015-01-07 15:47:14 -05:00
Inusaito Sayori
c592184aa6
Oops, uninstaller wasn't cleaning up the Portable shortcut.
2015-01-07 13:03:04 -05:00
Inusaito Sayori
bb297ac354
Add an assert for Issue 1784 (crash signature 450)
2015-01-07 00:46:01 -05:00
Inusaito Sayori
7871be05af
Login entry must be a map to construct an LLSavedLoginEntry, not just defined.
...
Login Screen Crash Fix.
2015-01-06 15:33:50 -05:00
Shyotl
1a9cd725b2
boost::mutex seems slow with vs2010, so fall back to apr_mutex for it.
2015-01-06 03:56:57 -06:00
Shyotl
1e0395c26d
Back to boost mutexes
2015-01-05 17:02:00 -06:00
Shyotl
7943adedaa
Also need this. Last build only succeeded due to lingering obsolete entries in the cmake var cache.
2015-01-05 14:25:55 -06:00
Inusaito Sayori
2285830c8f
This message ish too long now.
2015-01-04 09:55:09 -05:00
Inusaito Sayori
eff4bc7ad6
Bring back the Copy Key button and offer Copy SLURL as part of a flyout instead.
2015-01-03 22:50:55 -05:00
Inusaito Sayori
794027d91e
In (readonly) combo_boxes and flyout_buttons allow use of the font attribute.
2015-01-03 22:14:53 -05:00
Inusaito Sayori
312625036b
Fix max_chars on login screen, oopsie.
2015-01-03 15:50:42 -05:00
Inusaito Sayori
e7c1dc3b8e
Include object key in objectiminfo floater
...
General cleanup of llfloaterobjectiminfo included
Update of object im command handler code from v3
2014-12-30 18:02:32 -05:00
Inusaito Sayori
a29b50b4cd
Fix crash signature 86
...
Cleans up a buncha lame code in llpanellogin.cpp
Removes some static silliness from the old days.
Removes RememberLogin because RememberName serves its purpose.
Stylistic fixups~
Removes some pointless functions.
2014-12-30 16:49:40 -05:00
Inusaito Sayori
d03b03ac93
Fix crash signature 230
2014-12-30 14:42:13 -05:00
Shyotl
a891d2fdea
FMOD(STUDIO|EX)_SDK_DIR wasn't being properly set. Change fallback on missing msvc*, as the old code made no sense (wildcarded paths don't throw when not found)
2014-12-29 18:59:15 -06:00
Inusaito Sayori
de28034c20
Feature Request: Copy URI button in avatar profiles
...
This takes the copy key button's place... if this is bad, I'll figure something out down the line.
2014-12-29 18:53:01 -05:00
Inusaito Sayori
01c639c261
Map all the people!
2014-12-29 16:52:51 -05:00
Inusaito Sayori
fe21270bbc
[Radar] Attempt to fix the rare spamming of left/entered messages
2014-12-29 16:44:50 -05:00
Inusaito Sayori
b9acd64221
Better the cmdline_partial_name2key function
...
Just style fixes and opts.
2014-12-29 16:42:38 -05:00
Inusaito Sayori
9bf2092c7e
Don't hide the tab container for classifieds (especially not at the wrong time)
...
Thanks to Aztek Aeon for pointing out this bug!
Includes random stylistic fixes. (everywhere~)
2014-12-29 16:12:18 -05:00
Inusaito Sayori
0eba34d5a8
Can haz groups left count in groups list.
...
Translators, this is in panel_groups.xml and panel_groups_horiz.xml called groupcount
Inspired by Alchemy<3
2014-12-28 13:33:21 -05:00
Inusaito Sayori
5257eec81e
Address Issue 1761: Grid status from Help menu
...
Adds Grid Status... item to Help menu
Translators:
add WebLaunchGridStatus notification translation to notifications.xml
add Grid Status... menu item translation to menu_viewer.xml and menu_login.xml
Adds menu visibility function "VisibleSecondLife" for hiding things that shouldn't be shown on OpenSim
Hides SL issue tracker and wiki menu items on non-SL grids
2014-12-28 12:17:18 -05:00
Shyotl
2d2513369a
OSX poking.
2014-12-28 00:20:30 -06:00
Inusaito Sayori
6e8cd5a4cc
Bug fixy ~ Reset Ambient Occlusion setting on cancel
...
Thanks to Cale Flanagan for finding this one.
2014-12-27 13:11:11 -05:00
Inusaito Sayori
7749f8a99d
Edit Linked Parts counts and costs display update~
...
Show proper impact when editing multiple prims with edit linked parts enabled
Show "Selected prims:" instead of "Selected Objects: 0" when editing linked parts
Show two decimals of impact precision when editing linked parts.
2014-12-27 13:10:46 -05:00
Inusaito Sayori
ef32d0d321
French login panel further update.
2014-12-27 10:46:38 -05:00
Inusaito Sayori
f26d7c7bf2
Update instant message stuff
...
Fixes auto response chats not showing the name, anymore; switches to using 25% more font color transparency to indicate autoresponse
Cleans up and reorganizes im codestuffs~
2014-12-27 10:20:57 -05:00
Shyotl
86240966b6
Include build version and arch/platform in generated symbol file's name.
2014-12-27 02:54:04 -06:00
Shyotl
f5d3bc2b7b
Fixed CMP0026 properly. Requires cmake 2.8.8+
2014-12-26 23:53:14 -06:00
Shyotl
b3bd91877c
Fixed CMP0048 properly.
2014-12-26 23:51:05 -06:00
Shyotl
00123d2dde
Not sure why this line got deleted. It's needed for linux breakpad.
2014-12-25 01:57:59 -06:00
Shyotl
ecd58e3924
Reduce some diagnostic spam.
2014-12-23 20:00:01 -06:00
Shyotl
0ac3fd0563
Rename linux build directory from viewer-* to build-*. Also have mac use the unix run_build if not using Xcode
2014-12-22 20:52:11 -06:00
Inusaito Sayori
a805d15797
Do not include Server Release Notes, unless the region has that capability.
2014-12-22 21:05:19 -05:00
Shyotl
28024d7a01
Try better handling CMAKE_BUILD_TYPE if xcode (supports multi-configurations, unlike Unix Makefiles)
2014-12-22 02:42:31 -06:00
Shyotl
e0fb73414b
Mac fixup.
2014-12-22 02:08:18 -06:00
Inusaito Sayori
94d6969fed
Fix Resident no longer stripping for username only mode
...
Thanks for noticing this Gamer Expert
2014-12-19 21:27:07 -05:00
Inusaito Sayori
8e5fad2209
Login Panel Redesign Desu
...
More clear text
Cleaner appearance
Can haz tab from username to password to grid.
2014-12-19 21:26:03 -05:00
Shyotl
ca49db02df
Fixed doublequote issue with --extra_libraries
2014-12-19 19:25:31 -06:00
Shyotl
08db85fa99
Unused assets can DIAF.
2014-12-18 23:17:03 -06:00
Shyotl
e57bcea3b6
Experimentation with msbuild 12.0
2014-12-18 18:26:21 -06:00
Shyotl
5c5fae78c6
Fix some annoying issues with spaces in develop.py, for windows.
2014-12-18 18:08:59 -06:00
Shyotl
44f8f17763
V3 merge for most python scripts. fmod inclusion/linkage/packaging changes.
2014-12-18 18:01:41 -06:00
Inusaito Sayori
78e7b288b8
Fix ClickToWalk not allowing mouse-walk (behavior change)
...
Ansariel and worked together on this to solve http://jira.phoenixviewer.com/browse/FIRE-15189
The behavior change is that when your own avatar is clicked and the mouse is dragged, the camera no longer simply turns on a single axis,
since the behavior for dragging from anywhere else is still the old single-axis pan, this is not a very big deal. I can even see this being more useful!
2014-12-18 08:35:03 -05:00
Inusaito Sayori
78131d2d53
[OpenSim] Fix name lookup fails (on the agent only?) when a grid does not have NameLookupURL
2014-12-17 08:46:21 -05:00
Inusaito Sayori
ca8aa4dc0a
Remove the assert I was using to debug Issue 1670
...
Apparently it is failing on alphas during initialization (loading log file?)
Doesn't matter now, the issue is solved.
2014-12-17 01:28:13 -05:00
Lirusaito
81ef1292ed
Fix broked World->Chat
2014-12-16 21:35:28 -05:00
Inusaito Sayori
b67f55cff7
Prevent failure to create SLURL when an object chats but is not on the object list.
...
Fixes an issue I couldn't remember nor find on the issue tracker.
SLURLs for found objects remain unchanged.
SLURLs for objects that are not found, but we could find their owners now display the owner's position and region, with "?owner_not_object" appended to the slurl as a note to the user
SLURLs for objects that are not found, and we could not find their owners, now display as being from the position 0, 0, 0 in the users region
2014-12-16 19:57:46 -05:00
Inusaito Sayori
9880134b4d
Feature request: Add the ability to use keyboard shortcuts from the login panel, whether or not the login webpage is focused
2014-12-16 19:45:19 -05:00
Inusaito Sayori
cc32df6fd8
Update and Sync Mutelist with upstream alchemy
...
Satisfies the feature request for mute toggle to display mute status
Adds dynamic mute/unmute option to P2P IM dropdown.
Translators should look into the changes made in this commit for:
floater_chat_history.xml, floater_instant_message.xml, floater_instant_message_concisebuttons.xml
panel_avatar.xml has been taken care of for spanish and french, although they should be looked into more closely by the translators.
Cleanup and Sync in related places~
Removal of old static callbacks.
Moves God Names logic into LFSimFeatureHandler
Adds a custom function LLMuteList::hasMute() for quickly checking if a mute is in the internal set.
2014-12-16 19:42:27 -05:00
Inusaito Sayori
0e48a2196f
Update/Modernize LLAvatarName and LLAvatarNameCache and _EVERYTHING_ they touch
...
Fairly certain this adds the feature in which the user may click the online notification to open a chat with the user coming online.
Translators may want to look at the xml changes of this change to see what to update
Removes old LegacyMultiAttachmentSupport patch
Moves LLAvatarName-centric functions into LLAvatarName from elsewhere.
Adds boost::signals2::connections to name polling places.
Removes more old icky static callbacks
Merge from Alchemy, credit where due~
Update notifications.xml to have a bunch of the tags from upstream to ease diffing
2014-12-16 17:55:23 -05:00
Inusaito Sayori
39d27e3a4e
Move llavatarname.* to llmessage/ from llcommon/
2014-12-15 18:35:30 -05:00
Inusaito Sayori
48e6a4f535
LLPanelLogin code cleanup
2014-12-12 20:33:36 -05:00
Inusaito Sayori
7db5126182
Autoreplace toggle on Autoreplace toolbar button~
2014-12-12 20:26:03 -05:00
Inusaito Sayori
0d4ac69465
[Warnings] Fix sign/unsigned mismatch
2014-12-12 20:21:36 -05:00
Shyotl
32706065ac
Have CopyWinLibs only copy files needed for current configuration.
2014-12-12 03:49:47 -06:00
Shyotl
d571b8be81
Viewer manifest cleanup/updating
2014-12-09 16:13:59 -06:00
Shyotl
f014c8207c
Try path.os.basename/split instead of string.rsplit
2014-12-09 01:28:23 -06:00
Shyotl
b680b53128
Update vstool executable path.
2014-12-08 23:34:42 -06:00
Shyotl
e2cd11ccd7
Fix up some small typos and avoid c++11's string::back()/pop_back() calls for now.
2014-12-08 21:40:11 -06:00
Shyotl
ab4561aacc
Linux build pass.
2014-12-08 18:46:15 -06:00
Inusaito Sayori
a7733a6c55
Fixyfixy
2014-12-08 11:45:52 -05:00
Inusaito Sayori
688aa50064
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2014-12-05 19:13:55 -05:00
Inusaito Sayori
232bf22e51
Compile foxies
2014-12-05 18:43:50 -05:00
Inusaito Sayori
171c1a5c44
Fix media controls loading entered urls twice as much.
...
Thanks to Diva Canto for working with me on this!
2014-12-05 18:41:08 -05:00
Inusaito Sayori
80b4fe6613
Solve Issue 1755: Change Appearance Save button to a flyout option, and move File->Update Outfit
...
Update Outfit is now at the bottom of the inventory's File menu.
2014-12-05 18:39:05 -05:00
Inusaito Sayori
18f640d73d
Fix Linux linker errors
...
Patch by Aleric
2014-12-05 12:52:01 -05:00
Inusaito Sayori
9e2667261f
Timeout policy removal in llmarketplacefunctions.cpp
2014-12-05 12:16:12 -05:00
Shyotl
18e33d2268
Un-break build for older compilers.
2014-12-04 17:53:41 -06:00
Shyotl
fd13ccf802
Support running develop.py without needing to be in indra directory.
2014-12-04 17:23:27 -06:00
Shyotl
fbf947fcd7
Pre cmake3.0 support.
2014-12-04 16:43:52 -06:00
Shyotl
958031dbaf
Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout.
2014-12-03 22:36:42 -06:00
Shyotl
7ddef751ef
Update md5 checksums for vs2012 x64 libs.
2014-11-28 23:29:34 -06:00
Inusaito Sayori
a81ecc2006
Introduce LLInventoryAction namespace, move doToSelected into it.
2014-11-27 12:45:55 -05:00
Shyotl
fedd094987
Clean up warning. (implicit float to signed integer conversion)
2014-11-26 22:57:50 -06:00
Shyotl
36a8a20434
Alignment fixes.
2014-11-26 22:53:32 -06:00
Shyotl
f5204cc8f5
Check for bad FMOD_RESULT return values for practically every fmod api call. Wavedata dsp also now attached before fmod's fader DSP, and although that makes the stream channelgroup less than necessary, channelgroups are still nice to have.
2014-11-26 01:15:17 -06:00
Inusaito Sayori
808e262a4d
MAINT-3562 FIXED Viewer crashes when updating local textures using Substance Designer : add code for control input buffer size
...
3e69e78acb
2014-11-26 01:23:45 -05:00
Inusaito Sayori
152cf42029
This escaped the getOpenIcon->getIconOpen commit.
2014-11-25 23:39:10 -05:00
Inusaito Sayori
e69385861a
Add LLHTTPClient::putRaw
2014-11-25 23:36:43 -05:00
Shyotl
87f87bf2ff
Delegate stream shutdown to LLAudioEngine and LLStreamingAudio_*
2014-11-25 16:37:39 -06:00
Shyotl
b3d86e626b
Fixed wind dsp and implemented a DSP that mimics removed FMOD::Channel::getWaveData func.
...
Fixed crash if fmod profiling was enabled.
Fixed crash due to failing to check if resulting utf string from stream metadata was zero-length before calling std::string::back.
2014-11-25 16:32:04 -06:00
Inusaito Sayori
d80ebdc77d
getOpenIcon -> getIconOpen
2014-11-25 01:46:12 -05:00
Inusaito Sayori
80ac46c9a5
Move llfoldertype from llcommon/ to llinventory/
2014-11-24 20:38:46 -05:00
Lirusaito
4387118d55
Remove silly redundant code in LLFloater::draw
...
Thanks to Diva for pointing this out.
2014-11-23 18:50:59 -05:00
Shyotl
c2abbaedc8
Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio
2014-11-22 22:20:32 -06:00
Shyotl
f8927a8a11
Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio
...
Conflicts:
indra/llcommon/llsingleton.h
2014-11-22 22:19:44 -06:00
Shyotl
7054a2a6d2
Added some fasttimers to LLVOAvatar::idleUpdate
2014-11-22 22:04:18 -06:00
Shyotl
f2f8ecab98
Clean up code for vivox session participant management.
2014-11-22 22:02:46 -06:00
Shyotl
be9d417778
Added vector_shrink_to_fit to llstl.h
2014-11-22 22:02:20 -06:00
Shyotl
6e537cd322
Try to handle BOM for utf stream metadata (doesn't seem common, at all).
2014-11-22 22:01:45 -06:00
Inusaito Sayori
19cae9b59b
[RLVa] Escape potentially dirty strings before using them as regex in replace_all_regex
...
Fixes crashes
This changeset is welcome for use in LGPL viewers
Thanks to Ansariel Hiller for pointing this crash out.
2014-11-21 03:12:06 -05:00
Inusaito Sayori
89e65ed89e
CMake 3 Fixies from Alchemy
2014-11-20 22:04:32 -05:00
Inusaito Sayori
9892d23735
Sync stuff
2014-11-20 13:41:19 -05:00
Inusaito Sayori
10a3339019
Check for signing variables before even trying to sign
...
Also tabs to spaces and fix typo.
2014-11-20 13:40:05 -05:00
Inusaito Sayori
8b658bd628
Attempted fox for PNG
2014-11-20 12:21:35 -05:00
Lirusaito
5a045db751
Fix Voice on Linux.
...
No such thing as -st/shutdown timeout on Vivox 2.x SDK
2014-11-20 10:28:44 -05:00
Inusaito Sayori
80e7854300
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2014-11-17 22:50:18 -05:00
Inusaito Sayori
c83c1ed291
Add reset_camera to keyboard action registry.
2014-11-17 22:49:59 -05:00
Inusaito Sayori
37412c8dd2
wlfPanel cleanup and simplification
2014-11-10 18:25:31 -05:00
Damian Zhaoying
aaa1a5451e
Merge remote-tracking branch 'Liru/master'
2014-11-10 19:37:48 -03:00
Inusaito Sayori
e3d45d99da
Address Issue 1732: Display name in the Communication box
...
Adds Chat Tabs namesystem combobox to Adv. Chat->Chat UI.
2014-11-10 16:09:43 -05:00
Inusaito Sayori
60d9301646
Support GridName sim feature, show grid name in status bar when hypergridded over to another grid.
...
V3s will want to add this display to the NavBar, most likely.
Adds const Type& ref() function to SignaledType to get a const reference from it where needed.
2014-11-10 15:58:58 -05:00
Inusaito Sayori
23f070128a
Clean up and optimize more draw call logic in llstatusbar.cpp
2014-11-10 14:46:49 -05:00
Inusaito Sayori
39e0e4ad9e
LFSimFeatureHandler cleanup~
2014-11-10 13:36:23 -05:00
Damian Zhaoying
bde1853862
Merge remote-tracking branch 'Liru/master'
2014-10-30 14:47:32 -03:00
Lirusaito
637b70a723
Cleanup and revision to solve Issue 1548: Right click zoom in mouselook resets on left click.
...
Removes variables tracking right mouse down from lltoolfocus and lltoolcompgun in favor of using the already existing LLViewerWindow::getRightMouseDown()
2014-10-30 11:15:36 -04:00
Inusaito Sayori
d34c5034c3
Of course, I'd only notice this file is unstaged after the commit has been pushed.
2014-10-24 18:05:05 -04:00
Damian Zhaoying
8dc3dcd2ac
Added Spanish translations to new Quit button toolbar and Shared options
2014-10-23 21:36:21 -03:00
Inusaito Sayori
b25643f0bf
Clean up and draw optimization in LLStatusBar.
...
I saw a 1.7 FPS gain, which is pretty good for my old card ^*^
2014-10-23 04:28:18 -04:00
Inusaito Sayori
3231a7d25f
Complete keyboard-camera panning featureset with pgup pan in and pgdn pan out
2014-10-23 04:25:37 -04:00
Inusaito Sayori
855769c53e
Add quit button to toolbar.
2014-10-23 04:16:31 -04:00
Lirusaito
7cf069bf4c
Fix libpng warning: iCCP: known incorrect sRGB profile
2014-10-22 20:50:11 -04:00
Lirusaito
bd94e2ae73
Linux64 library update! (other platforms to come)
...
Curl 7.38
LibPNG 1.6.13
LLQTWebkit 4.8.6
OpenSSL 1.0.1j (Yep, this fixes POODLE)
Libraries provided by Alchemy Viewer.
2014-10-21 05:41:44 -04:00
Inusaito Sayori
6c2871402d
[RLVa] Don't filter parts of words out just because they match a name under restraint
...
This fix is free to be reused under LGPL..
2014-10-19 21:44:45 -04:00
Inusaito Sayori
341ca20529
Avatar Picker's list of friends should use the friends name system.
2014-10-18 15:05:10 -04:00
Inusaito Sayori
0d300776ca
Muscle Memory fix, move Share to the bottom of the inventory menu.
2014-10-18 14:40:59 -04:00
Inusaito Sayori
fad498cfb8
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2014-10-17 01:04:27 -04:00
Inusaito Sayori
39d3a58b49
Only disable friend items that have rights changed (scope reduction surgery)
...
Thanks to Deltek for finding this one!
2014-10-17 00:53:56 -04:00
Inusaito Sayori
e98792209e
Issue 1151: Add share to LLAvatarActions
...
Syncs LLGiveInventory and LLFloaterAvatarPicker with upstream.
Syncsyncsync~
Translators:
menu_inventory.xml menu_radar.xml and menu_avs_list.xml: Share
notifications.xml: ShareNotification, ShareItemsConfirmation, ShareFolderConfirmation, ItemsShared
strings.xml: share_alert
2014-10-17 00:33:33 -04:00
Inusaito Sayori
2d53641cd0
Fix up overcomplicated logic to get friends search working right.
2014-10-15 01:54:58 -04:00
Inusaito Sayori
529c61fabe
Fix friends list online count being wrong
...
This patch changes from always updating online count with cells, to checking the indicator cell's previous value before changing it, maintaining the count instead of always modifying it during updates..
Removes commented out OnlineSIP bits, as it's just easier not to upkeep them.
2014-10-15 01:20:01 -04:00
Damian Zhaoying
614a1c3bb6
Spanish translation to Fix "The notification called 'AuthRequest' was not found in notifications.xml." alert
...
Some minor fixes in other files.
2014-10-14 12:35:20 -03:00
Damian Zhaoying
663d9ce3d1
Merge remote-tracking branch 'Liru/master'
2014-10-14 04:42:59 -03:00
Latif Khalifa
67b8c8d360
Put Vivox license file online, avoid issues with local paths
2014-10-14 00:45:37 -04:00
Inusaito Sayori
4c5379fe30
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2014-10-14 00:43:32 -04:00
Inusaito Sayori
65c613fb3e
Clean up in the friends list code, fixing things~
...
The entire list should no longer lock up when changing friend rights for just some people
Visual changes:
Muted people's names in friends list are now displayed in the muted color (this still needs testing)
The collapse and expand button now uses icons instead of < and > characters.
Complex stuff devs may read:
Remove pointless classes, definitions, and functions.
Replace static callbacks with bound ones.
Cleanup commented stuff
Fix styling and spacing stuffs
Comment out unexecuted code paths
Optimizes updating uncached names so full refresh is not required, just a single name update.
Comment out unused voice stuff, since SIP buddylist was removed in Voice Update.
Switch to Params for list building~
2014-10-14 00:35:26 -04:00
Cinder Biscuits
d0f265f6d9
OMG backout worst fix of the year right here.
2014-10-12 21:56:50 +00:00
Cinder
ec4d13741f
Code signing for Windows and OS X
2014-10-10 21:30:23 -06:00
Cinder
d6b87f141f
Ported viewer-stare fixes
2014-10-10 21:17:47 -06:00
Inusaito Sayori
cd61a2ae20
Fix "The notification called 'AuthRequest' was not found in notifications.xml." alert
...
Thanks to Eva Darkwyr for alerting me of this.
2014-10-08 01:37:04 -04:00
Inusaito Sayori
d99528f4b4
GPU Table update
...
New cards added from the cool vl viewer's table, thanks Henri~
Tabbing fixed up so that the numbers all align.
2014-10-06 13:57:39 -04:00
Cinder Biscuits
775a7be958
Allow disabling crash reporter on mac
2014-10-06 01:45:54 -04:00
Inusaito Sayori
77f5851b3c
Nomade translated animation for appearance mode toggle
2014-10-03 03:55:55 -04:00
Damian Zhaoying
e4ac5c8f6c
Merge remote-tracking branch 'Liru/master'
2014-10-02 19:27:23 -03:00
Inusaito Sayori
4f6ec26dc9
Merge branch 'master' of github.com:slabua/SingularityViewer
2014-10-02 16:10:08 -04:00
Salvatore La Bua
55fda48a3b
Fix issue 1670: radio group for LinksForChattingObjects
2014-10-02 20:26:56 +02:00
Damian Zhaoying
5dc2bc06cf
Added Spanish Translation of xml export floater. Update translations in files notificationsa and floater radar.
2014-10-02 12:39:52 -03:00
Damian Zhaoying
f2367575a2
Merge remote-tracking branch 'Liru/master'
2014-10-02 03:58:38 -03:00
Inusaito Sayori
345d5d99b3
Woops, that logic is backwards.
2014-10-02 01:30:56 -04:00
Inusaito Sayori
5c86dfeb6e
Tiny tweak to handle_go_to that Ubit says will help on opensim
...
Doesn't seem to change anything on SecondLife.
2014-10-02 01:01:23 -04:00
Inusaito Sayori
b119aa49ef
Take SinguMotionResetsCamera into in handle_go_to.
2014-10-02 01:00:20 -04:00
Inusaito Sayori
8b84d5597f
Hide the drop target reset button when its in the default state
2014-10-01 23:23:54 -04:00
Inusaito Sayori
b060ba3c38
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-10-01 20:30:51 -04:00
Inusaito Sayori
17c2e93c78
Solve Issue 1696: buttons overlap
2014-10-01 18:45:15 -04:00
Inusaito Sayori
6a2353f08b
Feature Request: If only one prim in a linkset is selected, show its individual land impact, like we used to.
2014-10-01 18:44:59 -04:00
Inusaito Sayori
da2d80d23a
Useful fixies from upstream
2014-10-01 18:43:59 -04:00
Inusaito Sayori
01f2e70f1d
Fix Issue 1690: Problem in the Italian translation
2014-10-01 18:43:38 -04:00
Inusaito Sayori
b77268b0e3
Attempt to fix blank region name in region restarting floater.
2014-10-01 18:42:43 -04:00
Inusaito Sayori
6a4c1f6ac6
Feature Request: Add a clear button to drop targets (except where not needed).
2014-10-01 18:42:14 -04:00
Inusaito Sayori
1d6e21247e
Move LLDropTarget rectangle setting into a common function setChildRects
2014-10-01 18:41:53 -04:00
Inusaito Sayori
4a699d6160
Have Drop Targets with settings update when their settings update.
2014-10-01 18:35:09 -04:00
Inusaito Sayori
06584a38ab
Stylistic changes and whatnot for LLDropTarget what with setValue and setItem
2014-10-01 18:34:26 -04:00
Inusaito Sayori
d2dd03dcba
War on std::string::find compares against -1 instead of std::string::npos
2014-10-01 18:27:03 -04:00
Inusaito Sayori
3b631a4f90
Back out of droptarget support for links.
...
Drag and drop support for links would have to be done in lltooldraganddrop, and would probably require a rework there.
2014-10-01 18:26:44 -04:00
Aleric Inglewood
3555967812
Write <archetype><meta> for assets in "My Inventory" folder too.
2014-09-30 18:12:39 +02:00
Damian Zhaoying
358135a890
Merge remote-tracking branch 'Liru/master'
2014-09-20 16:10:10 -03:00
Inusaito Sayori
73ac76a0eb
LLDropTarget should accept link targets instead of links
...
Also stylization changes
2014-09-16 20:33:37 -04:00
Shyotl
972c92a3fe
Inconsequential template tweak.
2014-09-15 15:24:40 -05:00
Shyotl
f6209dec34
Silence some LL_INFOS spam on shader init.
2014-09-15 15:23:22 -05:00
Shyotl
738ce6422a
A bit of code consolidation. Unified code for OUT_TERSE_IMPROVED and OUT_FULL terse subset.
2014-09-15 15:22:33 -05:00
Inusaito Sayori
dd3cb2b43c
French Translation of xml export floater, thankies Nomade.
2014-09-14 17:18:19 -04:00
Damian Zhaoying
8fd1788ece
Merge remote-tracking branch 'Liru/master'
2014-09-13 14:46:59 -03:00
Inusaito Sayori
d34bd5338d
Comment out something from the llviewerobjectbackup.cpp sync that looks iffy and seemed to cause malfunction.
2014-09-11 22:27:25 -04:00
Inusaito Sayori
8dca737dc8
Solve Issue 1539: XML Export consistently fails as of latest alpha (build 5824)
2014-09-11 22:26:45 -04:00
Inusaito Sayori
86ff77665c
Sync llviewerobjectbackup with Cool VL Viewer
...
Note to Translators:
-Adds translation work to floater_object_backup.xml
-Adds ImportFailed, ExportAborted, and ConfirmAbortBackup to notifications.xml
Turns LLViewerObjectBackup into an LLFloaterSingleton.. but eventually, this should probably be an instance tracker on the uuid of the object to export or something instead.
2014-09-11 19:45:15 -04:00
Inusaito Sayori
e5e665b9ee
Sync LLAssetUploadResponders with upstream
...
Move LLSendTexLayerResponder into llviewertexlayer.cpp to reduce diff noise
2014-09-11 18:13:11 -04:00
Inusaito Sayori
6863eb6651
Be sure the object's inventory serial is incorrect before dirtying the inventory
...
Thanks to Ubit for pointing this out
2014-09-11 16:02:54 -04:00
Shyotl
0493a91a42
Boost 1.52 uses a completely different api for atomics. Not going to be supporting them. Also, fix llcalcparser in more old-boost compatible manner, and fix linux usage of apr_signal_description_get.
2014-09-11 05:20:01 -05:00
Inusaito Sayori
1ee939c7f7
[Radar] Feature Request: Add the ability to see avatar distance in avatar range alerts.
...
To toggle this feature, right click the radar, under the Alerts submenu choose "Include distance in alerts"
Cleans up code for calls to setPosition.
For now only entering messages will show distance, unless testing shows that it should be otherwise.
2014-09-11 03:58:23 -04:00
Inusaito Sayori
ff8b4fd95a
[Radar] Optimize hidden column evaluation and generation out of draw call.
...
Please view this diff without space changes.
2014-09-11 03:37:51 -04:00
Inusaito Sayori
a68983b37f
[Warnings] Fix ‘std::string {anonymous}::compute_CPUFamilyName(const char*, int, int)’ defined but not used
2014-09-10 16:58:44 -04:00
Drake Arconis
2d0905a4a6
Fix for fmod studio 1.5
2014-09-10 01:11:14 -04:00
Drake Arconis
eb96dee176
Murrrrge
2014-09-10 01:03:04 -04:00
Shyotl
df2ca052ea
I suppose actually including llvoavatar.cpp would help too...
2014-09-09 21:56:53 -05:00
Shyotl
e95c0a4631
Revert some bogus changes in f38754d0d6. Not sure where these changes came from.
2014-09-09 20:44:00 -05:00
Shyotl
fbbd45c674
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2014-09-09 19:48:42 -05:00
Shyotl
69064e96f0
Merge branch 'Supp'
2014-09-09 19:48:13 -05:00
Damian Zhaoying
1e0b95ca68
Update spanish translations. New Reset settings buttons in Graphics - DOF tab. Fix buttons in Group roles. Fix texts in map search places.
2014-09-09 14:36:39 -03:00
Inusaito Sayori
a5ac768540
Don't play empty audio urls.
2014-09-09 12:38:29 -04:00
Inusaito Sayori
1c7772e731
Sync with Alchemy, fixes not being able to send calling cards to people.
2014-09-08 21:25:12 -04:00
Cinder Biscuits
2db2c96329
Fix find evaluation on newer versions of clang (and 64-bit macs)
2014-09-07 22:43:03 -04:00
Inusaito Sayori
76616ee6f6
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2014-09-07 18:25:25 -04:00
Shyotl
37c7a72505
Implement boost and stl mutexes and atomics.
2014-09-07 17:18:55 -05:00
Inusaito Sayori
b198e296cb
Allow right clicking avatar lists with multiple avatars selected to invite to group.
2014-09-07 17:32:08 -04:00
Shyotl
f38754d0d6
Fixed an alignment issue with LLAvatarJointCollisionVolume array. Thanks Henri.
2014-09-07 15:55:53 -05:00
Shyotl
e5a0393480
Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git
2014-09-07 15:46:05 -05:00
Inusaito Sayori
e62ef91404
Fix sex radio: Now let's hear some kinky tunes~
2014-09-07 15:26:20 -05:00
Inusaito Sayori
71d78425be
Preload trash icon
...
Solves the issue where the remove saved login button has nothing on it
2014-09-07 15:26:12 -05:00
Inusaito Sayori
c7db5122c8
Fix Issue 1653: Using Search Box causes crash
2014-09-07 15:26:03 -05:00
Shyotl
89fcf69948
Added several temporary fasttimers to better pinpoint idle stall.
2014-09-07 15:22:19 -05:00
Inusaito Sayori
724ea77bef
Translate Render muted avatars to francais
2014-09-07 12:43:18 -04:00
Inusaito Sayori
b127dd514d
Stylistic changes and such.
2014-09-07 12:40:46 -04:00
Inusaito Sayori
a732635e75
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
2014-09-06 19:35:39 -04:00
Inusaito Sayori
5072f983ed
Fix up skins, remove poor line endings and remove a few nonexistent colors.
2014-09-06 19:17:29 -04:00
Inusaito Sayori
6c9fca3f61
Merge branch 'master' of github.com:slabua/SingularityViewer
2014-09-06 18:52:35 -04:00
Inusaito Sayori
91b98bed05
Fix sex radio: Now let's hear some kinky tunes~
2014-09-06 18:42:24 -04:00
Salvatore La Bua
195f7502b7
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2014-09-06 20:08:09 +02:00
Lirusaito
1b8779f93e
Fix teh Singletons to have a global registry
2014-09-06 11:30:25 -04:00
Salvatore La Bua
f0f124a23a
Add skin Dark Green, based upon the Dark skin
...
Little changes on fonts' and windows icons' colour.
2014-09-05 15:40:09 +02:00
Inusaito Sayori
2772daa964
Preload trash icon
...
Solves the issue where the remove saved login button has nothing on it
2014-09-04 18:35:28 -04:00
Inusaito Sayori
2338e8a186
Fix Issue 1653: Using Search Box causes crash
2014-09-04 17:32:21 -04:00
Inusaito Sayori
ab7acd7149
Modernize LLSingleton
2014-09-04 17:32:16 -04:00
Inusaito Sayori
43a9aedf7d
Sync with Upstream Alchemy
...
Changes LLEnvManagerNew::setRegionChangeCallback to LLAgent::addRegionChangedCallback
Cleans up some of the timeout policies that aren't necessary any longer.
Modernizes parts of LLViewerKeyboard, updates llregistry.h
Begins changeover from LLDynamicArray to std::vector
Minor merge of newer, trivial SSA functions.
Introduces LLAgent functions: addParcelChangedCallback and canJoinGroups
Support for secondlife:///app/appearance SLapps.
Cleans up older functions.
2014-09-04 17:32:03 -04:00
Shyotl
1608ed43c1
Release 1.8.6
2014-09-04 03:20:01 -05:00
Inusaito Sayori
fa103a69f9
I like jackals.
2014-09-03 21:49:08 -04:00
Inusaito Sayori
f8520f9dd3
Em Dash wants build tools to focus properly when the build button is clicked.
...
If the world is in focus and build button is pressed without the build floater open, don't bother focusing.
If a floater is in focus and build button is pressed without the build floater open, focus the build floater
If the build floater is in the background and the button is pressed, focus the build floater.
If the build floater is in focus and the button is pressed, close the build floater.
If the build floater is not in focus but nothing else is, close the build floater.
2014-09-03 19:41:07 -04:00
Inusaito Sayori
3a372afc0e
Add Render muted avatars check to System->Security & Privacy Preferences
...
Redefaulted LiruLegacyDisplayMuteds to false due to (at least) two alpha testers noticing it and wanting it back how it is in the current release (since 1.7.0).
True was to get back to the old ways of v1, but it's okay to be false by default, better now since it's exposed.
Also irrelevant tiny voice cleanup from Spatters.
2014-09-03 08:28:16 -04:00
Inusaito Sayori
95d6bec68f
Maximum bandwidth is apparently 10000 on SL Viewer, match that.
2014-09-03 08:28:11 -04:00
Inusaito Sayori
56f2e20cb4
Feature Request: Add LiruResizeRootWithScreen to prevent ui getting messed up when the window is resized
...
This is not complete, and it should only be used if you know what you're getting into.
2014-09-03 08:28:06 -04:00
Shyotl
4cbcaba7f2
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-09-03 01:47:43 -05:00
Shyotl
aeeca6e2c0
llcommon.dll doer faster. (set /LTCG and /GL)
2014-09-03 01:45:47 -05:00
Inusaito Sayori
74704d0d2a
Fix crash signature 608
...
This was a crash in LLPanelDirClassified::postBuild(), on the line changed here, probably accessng null pointer.
There are probably a few other signatures for this in our database.
2014-09-02 10:53:36 -04:00
Shyotl
0b384bdd72
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-09-02 02:57:28 -05:00
Shyotl
e9cf3a6806
Fix tiled snapshots. Also, LLRender::genRot takes degrees, not radians.
2014-09-02 02:53:10 -05:00
Shyotl
c5f9068664
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-09-01 00:49:05 -05:00
Shyotl
992bbbba1c
A bit of cleanup, and call subprocess.Popen with shell=True.
2014-09-01 00:47:39 -05:00
Shyotl
fe9dd63558
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-08-31 04:58:29 -05:00
Shyotl
8e45003c27
Packaging bugs. I'm drowning in them. (use subprocess.Popen instead of os.popen)
2014-08-31 04:56:55 -05:00
Shyotl
f53d824e07
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2014-08-31 00:05:11 -05:00
Shyotl
259670af85
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-08-31 00:04:59 -05:00
Shyotl
c7e9430f99
Avoid erroneously creating 'About Land' instance. Also avoid issuing 'ParcelPropertiesRequest' excessively.
2014-08-30 23:48:56 -05:00
Shyotl
afe573d2eb
Spaces in path... and nsi script... issues.
2014-08-30 23:47:32 -05:00
Shyotl
547d9817db
Replace \t with spaces in develop.py.
2014-08-30 18:57:12 -05:00
Shyotl
9c63243fe7
Fix issue with planar face alignment.
2014-08-30 18:56:27 -05:00
Shyotl
5535ba6b47
Fix issue with paths with spaces, in viewer_manifest.py
2014-08-30 16:25:46 -05:00
Drake Arconis
5059d5e2da
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2014-08-30 14:29:32 -04:00
Inusaito Sayori
52a80f98ed
Nomade's touches to french Object Weights Floater
...
Supposedly fixes a french crash.
2014-08-30 06:09:33 -04:00
Inusaito Sayori
9600319094
Add debug setting LiruHighlightNewInventory to prevent selection being changed on accepting new inventory.
2014-08-27 07:58:08 -04:00
Aleric Inglewood
9b930c8716
Don't set a SSL ctx callback when we don't use openSSL.
2014-08-26 19:19:06 +02:00
Aleric Inglewood
eb0d2e5b2c
libcurl-gnutls.so (debian) links with libgnutls.so
...
In that case we DO reach the assert here.
I verified that curl_global_init() indeed calls gnutls_global_init().
2014-08-26 01:35:13 +02:00
Aleric Inglewood
5e2722475a
This header uses LLMatrix4a, not LLMatrix4.
2014-08-26 00:29:59 +02:00
Aleric Inglewood
b1e406731d
Merge remote-tracking branch 'singu/master'
2014-08-25 18:39:46 +02:00
Aleric Inglewood
8c6d51cb71
No longer support DEBUG_CURLIO when libcwd isn't installed.
2014-08-25 17:58:45 +02:00
Shyotl
4b205084f8
Fix develop.py 'build' command.
2014-08-23 20:52:01 -05:00
Shyotl
eb910b0bae
Use /Zm140 for all windows builds.
2014-08-23 20:50:56 -05:00
Shyotl
09a6a1f259
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-08-23 01:37:48 -05:00
Shyotl
315618a18b
Fixed materials specularmap + glossiness=0 combination.
2014-08-23 01:34:25 -05:00
Inusaito Sayori
59af03695b
Fix debug settings boolean to work with the radiogroup update.
2014-08-23 00:24:57 -04:00
Inusaito Sayori
e1851f7b5b
Sync llwindowwin32 with Alchemy.
2014-08-22 21:47:52 -04:00
Inusaito Sayori
a126b4003f
Fix the first double click of every session failing.
2014-08-22 21:43:48 -04:00
Inusaito Sayori
9067de26ac
Seriously, what is logic?
2014-08-22 17:32:28 -04:00
Inusaito Sayori
260c5345fd
Logic, what's that?!
2014-08-22 16:16:08 -04:00
Drake Arconis
29195e8460
Merged upstream/master
2014-08-22 10:26:58 -04:00
Inusaito Sayori
e3dd05ef21
Fix the broken radio groups
...
Now can I go to sleep, Papa?
...
But I did my chores and fixed the bugs.
...
YAY! *runs off to bed*
2014-08-22 07:14:19 -04:00
Inusaito Sayori
9379bcedf9
A propos de [SHORT_APP_NAME]
2014-08-22 06:02:03 -04:00
Inusaito Sayori
2c91210d6e
Is almost zero approximately zero?
2014-08-22 06:01:45 -04:00
Shyotl
f721d935e4
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2014-08-22 03:55:21 -05:00
Shyotl
66597cade3
Use [SHORT_APP_NAME] xui/de/floater_about.xml as per liru request.
2014-08-22 03:52:13 -05:00
Shyotl
3c5f39e26a
Use a dynamic buffer for LLMeshHeaderResponder.
2014-08-22 03:41:00 -05:00
Shyotl
24e3176f1b
Fixed some odd initialization oddness in develop.py. Also changed win64 build targetdir to build-vc###-Win64
2014-08-22 03:38:49 -05:00
Drake Arconis
e49156a074
Fix mesh upload broken by #
2014-08-22 00:29:46 -04:00
Drake Arconis
948ebe5213
All your codebase are belong to us.
2014-08-22 00:15:09 -04:00
Drake Arconis
2a64c07215
Fix fmodex breakage
2014-08-21 22:00:59 -04:00
Drake Arconis
578a5719dd
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2014-08-21 21:59:51 -04:00
Shyotl
e59757e3e8
Clean up a few harmless compiler warnings (signed/unsigned, double to float)
2014-08-20 19:43:32 -05:00
Shyotl
282de8c7f5
Only use LLAvatarJoint when necessary, else LLJoint
2014-08-20 19:40:31 -05:00
Shyotl
541021f29c
Fix relwithdebug.
2014-08-20 17:42:48 -05:00
Melanie
6804253bfc
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
...
Conflicts:
indra/newview/llfloaterperms.cpp
2014-08-20 05:46:50 +02:00
Inusaito Sayori
e01b9dcd39
If it's not a translation, don't change APP_NAME and related strings in strings.xml
2014-08-19 20:06:43 -04:00
Inusaito Sayori
8d4567b930
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2014-08-19 19:55:34 -04:00
Inusaito Sayori
6f6988a487
Add "Move to Lost And Found" option for displaced inventory
...
Inspired by the work of Kitty Barnett
Fixes Issue 1337: Corrupted Inventory
Fixes Issue 1625: Unattainable inventory is Outside of My Inventoy and no options to move back to My Inventory
Fixes Issue 1580: Deleted folders showing outside of inventory folder.
2014-08-19 19:52:24 -04:00
Inusaito Sayori
435ab2ce77
Modernize llradiogroup, allows v3-style attributes: value, label for radio_item; allow_deselect for radio_group.
...
LLRadioCtrl moves into llradiogroup.cpp
2014-08-19 19:42:42 -04:00
Shyotl
1afd723c4e
Post-merge fixup.
2014-08-19 01:36:24 -05:00
Shyotl
b09f7f5ac7
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
...
Conflicts:
indra/newview/llviewerobjectlist.cpp
indra/newview/llviewerpartsim.cpp
2014-08-18 23:55:03 -05:00
Shyotl
1b3f0f9ec0
Manual texture reloading now re-fetches materials-related textures.
2014-08-18 23:47:37 -05:00
Shyotl
d1d68721ac
Pulled mesh header info parsing and VFS fetching into their own procedures to remove duplicate code.
2014-08-18 17:16:45 -05:00
Inusaito Sayori
2f4afe5b68
Fix About [APP_NAME] to read About [SHORT_APP_NAME]
2014-08-18 17:58:45 -04:00
Shyotl
47fcc70756
Write initial mesh data to file in larger chunks. Reduces file i/o stalls.
2014-08-18 00:54:46 -05:00
Shyotl
0e86b696c5
Added more verbose statemachine debug output.
2014-08-18 00:54:01 -05:00
Shyotl
54f05b409c
Always use dynamic_cast when casting from an LLJoint*
2014-08-13 18:04:24 -05:00
Inusaito Sayori
350dff9b98
Cinder made some logic enhancements to hippogridmanager.cpp, I've picked them up~
2014-08-13 02:34:52 -04:00
Inusaito Sayori
f198221812
System preferences and Menu translation updates by Nomade Zhao.
2014-08-13 02:04:17 -04:00
Inusaito Sayori
dee08b4216
Spanish translation pruning, also Manage ban list translation by Damian.
2014-08-13 02:02:34 -04:00
Damian Zhaoying
e02d074a85
Merge remote-tracking branch 'Liru/master'
2014-08-11 18:25:32 -03:00
Damian Zhaoying
8e2da87b97
Update spanish translations to reflect a lot of changes and adds in last Alphas builds.
2014-08-11 18:22:34 -03:00
Inusaito Sayori
2deba06212
Missed a spot with the date column for group bans
...
I'm thinking of putting a setting here instead of hardcoding the date format, actually, but for now this is good enough.
2014-08-11 14:36:37 -04:00
Drake Arconis
90d2dce07a
Add FMOD Studio support
2014-08-10 17:41:10 -04:00
Latif Khalifa
a6ac8e1f71
Workaround for clang bugs
2014-08-09 11:24:22 -04:00
Inusaito Sayori
69436a9032
Add french translation for connect to neighboring regions from Nomade Zhao
2014-08-09 10:50:24 -04:00
Inusaito Sayori
50d91d13be
Allow dragging and dropping to attached objects
...
There's now a guard serverside that'll prevent the situation that would cause things to break in the past, so there's no reason not to have this.
2014-08-08 16:26:40 -04:00
Inusaito Sayori
54a6db146e
Upon further consideration and a bit of feedback, the new matching common characters behavior of gesture autocomplete is probably bad, I've commented it out and brought back the old code.
2014-08-08 14:57:14 -04:00
Inusaito Sayori
3b31fe91a6
Address Deltek's concern that the Open Attachment button wasn't changing text to just say save when the object is not the openable type.
2014-08-08 14:52:52 -04:00
Inusaito Sayori
90c5219be9
Move Media Filter from the View menu to the Singularity menu.
...
Moves Media Filter in all translations, no need for translators to worry~
Nomade, please translate the Singularity menu at your discretion.. in menu_viewer.xml
2014-08-08 08:43:24 -04:00
Inusaito Sayori
669fe29173
Initialize members of LLMediaFilter, fixes win64 filter being broken.
2014-08-08 08:26:48 -04:00
Inusaito Sayori
d7d06c8234
Oh, and this one too, maybe it is fixed now?
2014-08-08 07:07:51 -04:00
Inusaito Sayori
4754c1322d
This should probably be a size_t, perhaps this fixes the win64 mediafilter bug.
2014-08-07 21:56:25 -04:00
Inusaito Sayori
acb093c277
Media Filter code cleanup
2014-08-07 20:37:03 -04:00
Inusaito Sayori
21d54edeb9
Per-slider reset buttons? Sure.
...
Adds callback to registrar: "Prefs.Reset", pass debug setting name as parameter.
2014-08-07 20:29:12 -04:00
Inusaito Sayori
20ea0968da
Feature Request from friti: Add a reset button to Depth of Field tab of graphics.
...
Actually should've committed this last night. X3
2014-08-07 08:31:26 -04:00
Shyotl
398d8c52a2
Minor cleanup.
2014-08-07 01:57:11 -05:00
Lirusaito
f82d12d381
Fix linker errors on linux after merging Shyotl
2014-08-07 01:54:56 -05:00
Lirusaito
91ee5724ca
Fix compile errors and warnings on linux after merging Shyotl.
2014-08-07 01:54:45 -05:00
Inusaito Sayori
a82443f271
Make sure that we have a token when doing sscanf in llinventory.cpp and llviewerobject.cpp
...
Guards against opensim grids that may leave new/blank lines of sorts after their message blocks
2014-08-06 23:29:23 -04:00
Cinder Biscuits
1cd0b70055
Fix filling in MediaAlert notification.
2014-08-06 16:34:23 -04:00
Inusaito Sayori
8f8904ad0f
Feature Request: Autoselect the parcel you are on for about land floater when there's no active parcel selection.
2014-08-05 23:25:39 -04:00
Shyotl
e975e389df
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
...
Conflicts:
indra/newview/llnetmap.cpp
2014-08-05 18:17:13 -05:00
Inusaito Sayori
d3242393e0
Better default rect for those two new v3 floaters (destinations and avatar picker) from Latif.
2014-08-05 13:35:42 -04:00
Inusaito Sayori
ce7d0e81bd
Toggle control_name in <floater/>'s like booleans for visibility, if they exist.
...
Look out for this in the UI Overhaul merge, this is gonna clash big time.
2014-08-05 12:48:28 -04:00
Inusaito Sayori
0cf16e6f8f
Allow edit menu shortcuts to work while on login screen~
2014-08-05 11:20:58 -04:00
Inusaito Sayori
0ab395794e
[Warnings] "One more," says friti; "One more," fixes Liru.
2014-08-05 00:57:26 -04:00
Inusaito Sayori
ac06a8394b
I'm a sillyfolf, here's a compile fix.
2014-08-05 00:48:13 -04:00
Inusaito Sayori
46dd1ad154
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-08-05 00:34:06 -04:00
Inusaito Sayori
e57a7b6f3b
[Warnings] Fix the "no biggie" warnings
...
Thanks to friti for providing the pastebin~
2014-08-05 00:31:52 -04:00
Inusaito Sayori
409128b07f
[Warnings] enumeral mismatch in conditional expression: ‘DS3Keys’ vs ‘XBoxKeys’ [-Wenum-compare]
...
Thought I covered this one already...
2014-08-05 00:31:03 -04:00
Inusaito Sayori
fd562061ee
Update simple codeless floater behavior
...
Such that floater's named according to their filename will now close if they were frontmost
making their menu entries and buttons, toggly.
This effects the behavior of the toolbar preferences floater, the Favorites floater, and the My Outfits floater.
(and any such simple extensions made by forks and those that will come in the future)
2014-08-04 23:36:47 -04:00
Inusaito Sayori
c6a7dc8f9c
Nomade's update to Camera and Input preferences.
2014-08-04 23:32:44 -04:00
Shyotl
5275f7e852
Re-determine spatial groups for hud attachments upon teleport. Fixes missing prim issue.
2014-08-03 18:52:06 -05:00
Inusaito Sayori
6ec19e4630
Minor edits to french translation.
2014-08-01 09:01:48 -04:00
Inusaito Sayori
690ac8d4b1
Ooooops, broke showcase tab on SL, needs to expandURLSubstitutions().
2014-08-01 05:56:20 -04:00
Inusaito Sayori
7ae1cd33be
Add debug setting LiruShowTransactionThreshold for filtering out low amount transaction notifications.
2014-08-01 05:21:14 -04:00
Inusaito Sayori
a7c6c184da
Now that I'm more awake, this is a far better solution for the default sim features issues.
...
Adds const Type mDefaultValue reset() and getDefault() to SignaledType
Cleans up code by not needing to reset to the default by value every time, nice template function to do this~
Leaves in hg boolean, but commented out in case opensim ever decides to make that a reality.
2014-07-31 22:50:02 -04:00
Inusaito Sayori
29d6b423a3
Toolbar prefs was filling up quick, gave it an extra 20 pixels of height and reordered.
2014-07-31 14:52:41 -04:00
Inusaito Sayori
b3590c5ae6
Add Default Avatar Picker Floater (World->Default Avatars)
...
Default Avatars button option added to Toolbar prefs.
Adds debug setting ToolbarVisibleAvatar
Hooks into "avatar_picker_url" login response on opensim.
Also includes hooking up of DestinationGuideShown to startup, which was left unstaged from the initial commit of the Destination Guide.
2014-07-31 14:45:27 -04:00
Inusaito Sayori
67f549d86d
SimFeaturesHandler: Work around grids where OpenSimExtras aren't implemented by not overriding hg strings there.
2014-07-31 11:29:26 -04:00
Inusaito Sayori
9096265bff
Possible solution for Issue 954: Singularity Alpha Build 4701 EULA file missing on first login.
2014-07-31 11:20:17 -04:00
Inusaito Sayori
ce265b3948
Add Destination Guide
...
Adds llfloaterdestinations.* and floater_destinations.xml (needs translations, but not really)
Adds GenericErrorPageURL, DestinationGuideURL (not persistent), DestinationGuideShown, and DestinationGuideRect to debug settings
Removes ShowcaseURLDefault in favor of DestinationGuideURL from upstream.
Also Adds ToolbarVisibleDestinations for the toolbar button, but I'll need to set up a nice way to make the button invisible when the url is empty before adding it to the gui... maybe.. or maybe it's just not important.
This commit comes with support for dynamically changing destination guide page based on opensimextras simulator features cap
2014-07-31 10:07:11 -04:00
Inusaito Sayori
7fee70543d
Login Response support for destination_guide_url, OpenSimExtras support (properly) search-server-url, and support the new destination-guide-url from OpenSimExtras
...
Expands SignaledType's callback to accept const Type& as argument.
typedefs Signal::slot_type to slot_t so that SignaledType can be altered without needing to update all lines setting slots.
Merges floater_directory.xml with floater_directory(2|3).xml
Condenses translations down to one xml(, finally the nightmare is over).
Better ui code support for classic find all panel
Not like anyone cares, but ShowcaseURLDefault no longer persists value changes between sessions.
Moves SearchType and getSearchUrl(SearchType ty, bool is_web) from HippoGridInfo into a namespace in llpaneldirfind.cpp, the only place where it is used; so that it may wrap the sim feature lookup.
Thanks to Shyotl for the help in dynamically maintaining tab positions for dynamic tabs.
2014-07-31 08:12:00 -04:00
Inusaito Sayori
f3a48bb0f0
Silk Aeon wants greater precision on the Object Weights Floater.
2014-07-30 08:43:12 -04:00
Inusaito Sayori
c151c12b95
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-07-25 20:55:39 -04:00
Aleric Inglewood
b8d999066d
Allow usage of default timeout policy
2014-07-26 02:46:11 +02:00
Inusaito Sayori
0e816492b4
Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal
2014-07-23 22:08:12 -04:00
Inusaito Sayori
c6ef099e18
When we setTextEntry on a combo box, move the cursor to the beginning of the new text.
...
This fixes the login location combo box not displaying the location cleanly after appending coordinates and such.
2014-07-23 18:15:14 -04:00
Inusaito Sayori
1c5872da0c
Fix the grids combobox on the login panel not being scrollable because of constantly reordering grids
...
Still select the current grid, just use its index number to select it, instead of hacking it to the top of the combo box.
2014-07-23 18:12:18 -04:00
Shyotl
d95e94fa07
Missed a cast to LLMatrix4. Was causing assorted wonkiness (most noticeably, mouselook oddities)
2014-07-23 16:55:46 -05:00
Inusaito Sayori
d7bbbd9d40
Fix Group Role Data never loading since the group bans merge.
2014-07-23 16:58:41 -04:00
Inusaito Sayori
cf56659b18
Add xcode_fix.sh to scripts/ to avoid users needing to download it.
2014-07-23 16:51:14 -04:00
Inusaito Sayori
4163b8e40b
Well that's a strange bug... eh, not too important.
2014-07-22 14:38:29 -04:00
Inusaito Sayori
4ca6a5c52c
Sync up most of the realistic mouselook code with alchemy.
...
This should fix the inverted mouselook when sitting problem
Think the bug was in llvoavatar, but keeping in sync is always good for the future overall.
2014-07-22 07:07:38 -04:00
Inusaito Sayori
511811de3b
Fix Media Filtering preferences code to work right.
2014-07-22 07:05:36 -04:00
Inusaito Sayori
6ef4dfb61f
Fix Media Filtering preferences UI to look proper.
2014-07-22 05:49:41 -04:00
Inusaito Sayori
5ca2a3b0f7
Feature request: Change status bar search to search in all (applicable) tabs
...
Opens up to last tab selected now, but puts query text and triggers searches in all tabs.
Singu TODO: Have it search marketplace?
2014-07-22 05:48:30 -04:00
Inusaito Sayori
88794d0288
Add "Connect to neighboring regions" checkbox to Vanity->Main preferences.
2014-07-22 04:40:21 -04:00
Lirusaito
30e76a7c11
Fix linker errors on linux after merging Shyotl
2014-07-22 04:24:26 -04:00
Lirusaito
41eb687243
Fix compile errors and warnings on linux after merging Shyotl.
2014-07-22 03:39:01 -04:00
Inusaito Sayori
5191baa659
Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal
...
Conflicts:
indra/newview/llnetmap.cpp - Thankies Shyotl~
2014-07-21 23:31:59 -04:00
Inusaito Sayori
8159eff664
Ban From Group option belongs in the Moderation submenu on the radar.
2014-07-21 23:13:12 -04:00
Inusaito Sayori
c6eb3d790e
MAINT-4241 FIXED [Group Bans] Ban member(s) button is not greyed out for banning group owners. Viewer gives message that you ejected group owner.
...
by Andrey Kleshchev
5598f66
2014-07-21 23:11:53 -04:00
Inusaito Sayori
f62fc8ab15
Fix right clicking on lists of avatars and selecting ban/invite not working for nonfriends who aren't nearby.
...
Also touch up group invite floater to show names we can't get from voavatars in the user's global namesystem preference.
2014-07-21 23:11:03 -04:00
Inusaito Sayori
75e85701c6
Add Ban From Group option to right click menu of avatar lists.
...
Also missed two touchups for the Responder API merge in llfloaterperms.cpp
2014-07-21 22:56:18 -04:00
Shyotl
cd85afc9a5
Quick workaround to fix issue with simple geom not rendering in deferred 'underwater' pass.
2014-07-21 20:28:23 -05:00
Inusaito Sayori
b9ba472eda
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/newview/llspeakers.cpp
Compile fixes:
indra/newview/llgroupmgr.cpp - uncomment new API for GroupBanDataResponder
2014-07-21 19:56:35 -04:00
Inusaito Sayori
bf9d3acf33
Factor in mAvatarOffset(hover) when calculating the legacy offset, though I doubt this helps.
2014-07-21 19:07:16 -04:00
Inusaito Sayori
bd7e291787
Debug output that was once useful to me.
2014-07-21 19:05:24 -04:00
Inusaito Sayori
73b34b6d89
When there is nothing selected in a media filter list, don't enable its remove button
...
Also missed xml parts from last commit.
2014-07-21 18:51:20 -04:00
Inusaito Sayori
f2c7290ee8
Touchups to Cinder's new media filter code!
2014-07-21 18:30:05 -04:00
Inusaito Sayori
6f6938f5bb
Function removal in LFFloaterInvPanel, in favor of boost::bind function.
2014-07-21 18:04:20 -04:00
Inusaito Sayori
601ff92871
Address Issue 1570: Make comboboxes scrollable
...
Note: It appears that mLabel is never set by combo boxes, this should eventually be fixed.
Checking !getFirstSelected() is sufficient to test if we're in the list, however.
2014-07-21 18:00:43 -04:00
Cinder
f119986fad
Remove orphaned media filter notifications
2014-07-21 14:49:39 -04:00
Cinder
402cd21f87
Hi.
2014-07-21 14:49:33 -04:00
Cinder
8cb694af89
Orphaned local function
2014-07-21 14:49:26 -04:00
Cinder
73d8cedf7e
A few changes after code review from Liru
2014-07-21 14:49:18 -04:00
Cinder
b7e8d36cf8
I do things.
2014-07-21 14:49:09 -04:00
Cinder
45f5eb9671
Replace the media filter with something a little different
2014-07-21 14:48:57 -04:00
Shyotl
16fe6d0dcf
Fix compile. Remove call to temporary matrix sanity check.
2014-07-21 01:27:45 -05:00
Inusaito Sayori
b633c3ffea
Fix Issue 1593: "Attachment" button on Group Notices
2014-07-15 15:37:02 -04:00
Inusaito Sayori
ca1696823c
French translation updates, by me~
2014-07-14 03:20:48 -04:00
Inusaito Sayori
c1cc9d484a
Add AlchemyConnectToNeighbors
2014-07-13 19:43:00 -04:00
Liru
db75cb3e17
Fix down arrow not working in inventory after the v-t sync, I must've missed this spot.
2014-07-13 12:51:11 -04:00
Liru
b8a17c8f22
Finish work on MAINT-3119 FIXED Return common chars for triggers that matches the prefix.
...
Makes the code cleaner too, upstream made this too messy.
2014-07-13 10:28:41 -04:00
Aleric Inglewood
74dff061ff
Support for new LL Responder API.
...
This adds mStatus, mReason and mContent to ResponderBase
and fills those in instead of passing it to member functions.
The added danger here is that now code can accidently try
to access these variables while they didn't already get a
correct value.
Affected members of ResponderBase (that now have less arguments):
decode_llsd_body, decode_raw_body, completedHeaders,
completed -> httpCompleted, result -> httpSuccess,
errorWithContent and error -> httpFailure.
New API:
ResponderBase::setResult
ResponderBase::getStatus()
ResponderBase::getReason()
ResponderBase::getContent()
ResponderBase::getResponseHeaders() (returns AIHTTPReceivedHeaders though, not LLSD)
ResponderBase::dumpResponse()
ResponderWithCompleted::completeResult
ResponderWithResult::failureResult (previously pubErrorWithContent)
ResponderWithResult::successResult (previously pubResult)
Not implemented:
getHTTPMethod() - use getName() instead which returns the class name of the responder.
completedHeaders() is still called as usual, although you can ignore
it (not implement in a derived responder) and call getResponseHeaders()
instead, provided you implement needsHeaders() and have it return true.
However, classes derived from ResponderHeadersOnly do not have
completedHeaders(), so they still must implement completedHeaders(),
and then call getResponseHeaders() or just access mReceivedHeaders
directly, as usual.
2014-07-12 18:29:44 +02:00
Aleric Inglewood
3dd846b600
Stop people from wearing their whole root folder.
2014-07-12 14:38:54 +02:00
Inusaito Sayori
8a2e24ecd0
Sync with viewer-tiger~
...
Syncs up llmath stuffs.
Thanks to Shyotl for the CMakeLists fix for Wbemuuid.
2014-07-11 20:36:19 -04:00
Aleric Inglewood
6ccca51fee
Compiler warning fixes.
...
g_thread_init is automatically called since 2.32 (and deprecated since 2.35).
g_type_init is automatically called since 2.36 and will be deprecated in the
future.
2014-07-11 17:10:27 +02:00
Aleric Inglewood
a4b3c3d1ad
Remove self dependency of llwindow.
...
Needed to avoid an error message from cmake 2.8.12.1 and higher
(policy 0022).
2014-07-11 16:32:55 +02:00
Inusaito Sayori
bc8947289b
Sync
...
Includes:
MAINT-3541 (crash in std::vector >::reserve)
MAINT-3364 FIXED Call clearSelection() from root_folder
MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.
MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to match new MBP with forced Intel graphics
MAINT-3119 FIXED Return common chars for triggers that matches the prefix.
MAINT-3661 Fix for crash when uploading corrupt .dae file.
MAINT-3671 FIXED Rename title when new tab is added.
MAINT-3465 FIXED Add check mark to selected entry.
BUG-5537 FIX reverting breaking changes to pectorals and belly.
MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirmation dialog for teleporting via slapp is added.
2014-07-11 09:31:51 -04:00
Inusaito Sayori
e7c506c6ec
MAINT-3496 FIXED Disable "Allow group access" option if "Sell passes to: group" is selected(and vice versa).
2014-07-11 06:52:25 -04:00
Inusaito Sayori
8236964029
Missed the setting for joystick button on toolbar, oops.
2014-07-11 06:42:46 -04:00
Inusaito Sayori
aadecaf102
MAINT-3530 : Add viewer checkbox to extend parcel entry limits to a higher ceiling
2014-07-11 06:42:20 -04:00
Inusaito Sayori
b55e45eef6
Add a joystick on/off toggle to the new joystick toolbar button~
2014-07-11 01:20:22 -04:00
Inusaito Sayori
adbc928148
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2014-07-10 23:46:47 -04:00
Inusaito Sayori
c4c206076a
Add the option to have a toolbar button for joystick configuration
2014-07-10 23:42:43 -04:00
Inusaito Sayori
5c077d7037
Suppress the annoying 404 notification from default perms
2014-07-10 22:43:36 -04:00
Inusaito Sayori
8583a2f4f7
Idea!: Set to defaults flyout button with options for all styles of joystick controller
...
The button portion does nothing if there is an unknown or no controller connected, otherwise it sets defaults for the controller's identified type.
Joystick buttons are still configured based on identification, however.
DS3 users will likely find that using Motion in Joy switchboards is much more effective, however.
2014-07-10 22:38:30 -04:00
Inusaito Sayori
ed8416ea10
Add a hack to make classified panel in search actually change
...
We cannot know the creator when we send the request, so use null to trigger the workaround.
2014-07-09 23:22:10 -04:00
Inusaito Sayori
deb7454cf7
Cure Issue 1586: Singularity crashes when adding classified adds on opensim grids (untested in SL)
...
Following as it is done upstream, no more requests on null ids.
2014-07-09 16:45:40 -04:00
Inusaito Sayori
8c40af5aee
Sync up llpanelclassified.* a bit for easier diffings.
2014-07-09 16:18:19 -04:00
Inusaito Sayori
dd893bab41
Work towards curing Issue 1586: Singularity crashes when adding classified adds on opensim grids (untested in SL)
2014-07-09 15:29:38 -04:00
Lirusaito
759ee62e7c
/open for opening avatar profiles by id~
2014-07-09 03:18:08 -04:00
Lirusaito
1e9b79e2c1
Fix old namesystem code that broke initially setting Legacy (w/display) for everything in general.
...
Also cleans up old logic and directs the friends list to update when the user changes the namesystem for it specifically.
Thanks to um... I think it was Deltek, who discovered this bug.
2014-07-09 03:08:13 -04:00
Lirusaito
315883a28c
Fix Issue 1577: Color yellow hard to read on Radar
...
Thanks to Carla Gomes
2014-07-09 03:00:38 -04:00
Lirusaito
19b85afe12
Allow gtp with implicit current height when z is not provided.
2014-07-09 02:56:09 -04:00
Inusaito Sayori
b2e8a31d68
Address Issue 1571: Newer OSSL functions not recognized by Script Editor
2014-07-08 19:15:19 -04:00
Inusaito Sayori
b4b12732cb
Add new materials script constants to keywords.ini
2014-07-08 18:48:59 -04:00
Inusaito Sayori
c714c57bb2
Solve Issue 1572: Checkbox not saving its tick
2014-07-08 18:31:23 -04:00
Shyotl
4697216c5e
Utilize vector_replace_with_last
2014-07-05 19:29:10 -05:00
Shyotl
e2fa94e2c3
Fixed water normals.
2014-07-05 19:09:21 -05:00
Siana Gearz
7578a27bf7
Fix RLVa in About floater
2014-07-05 14:11:26 +02:00
Siana Gearz
14e0b3c9e6
Latif's Breakpad from Replex
2014-07-05 04:14:58 +02:00
Shyotl
815acfc7da
Don't use SHGetSpecialFolderPath since it's dead. Use SHGetFolderPath instead, as that still is supported on XP, and is merely deprecated, not removed from newer SDKs (yet).
2014-07-04 20:25:35 -05:00
Shyotl
7d8af7d413
Use one shared vbo to draw fullscreen rectangles in LLPipeline, for both deferred and non-deferred. Provides a nice bit of cleanup.
2014-07-03 17:09:27 -05:00
Shyotl
39810ed516
Removed several unused variables from LLPipeline
2014-07-03 02:34:10 -05:00
Shyotl
9cbcf8fe34
Removed glh_linear and glu dependencies from viewer.
2014-07-03 02:11:45 -05:00
Inusaito Sayori
02b476035b
Correct Issue 1562: Environment Editor Floater not Opening Initially
2014-06-26 15:08:04 -04:00
Inusaito Sayori
9eb338f417
Merge up RLVa in llinventorybridge.cpp and remove old commented code
...
Just something I did to ease mergies.
Adds RLVaDebugDeprecateExplicitPoint
Ignore space changes
2014-06-25 15:23:04 -04:00
Inusaito Sayori
15e30604fc
Feature Request: Add an option to bypass closing active viewers when (un)installing
2014-06-25 00:12:12 -04:00
Shyotl
21f677cf58
Remove glh::matrix4f variant of glh_get_current_modelview.
2014-06-24 01:23:08 -05:00
Shyotl
3ead892b1c
Re-worked animated linden trees to reduce duplicate code and provide a cleaner diff.
2014-06-24 01:17:47 -05:00
Shyotl
a59e87a896
Added a gradient fade to the minimap viewcone visualization.
2014-06-22 03:55:29 -05:00
Shyotl
96df7b82de
Change texture default to non-auto-alphamaskable, non-pickable. Only 'fetchable' textures may qualify for either.
2014-06-22 03:53:08 -05:00
Shyotl
5cb5d284c3
Initialize LLRender::mHasTextureSwizzle to false.
2014-06-22 03:44:48 -05:00
Shyotl
869517b9c6
Evidently a line in objectSkinV.glsl escaped earlier staging.
2014-06-22 03:43:43 -05:00
Shyotl
56cefce1cc
Enable auto-alphamasking for attachments, and force to use V3 auto-alphamask algorithm for said attachments.
2014-06-22 03:42:37 -05:00
Shyotl
165af85894
Altered vector_replace_with_last to work around MSVC2010 compiler bug.
2014-06-22 03:40:12 -05:00
Shyotl
7c073c1db7
Explicit enforcement of alignment for all aligned types, including structures with aligned members. (Compiler handholding)
2014-06-22 03:39:33 -05:00
Shyotl
061178ad82
Migrated gl matrix stack to LLMatrix4a
2014-06-22 03:34:51 -05:00
Inusaito Sayori
dbc7c6e74d
OUYA has different defaults, store its defaultification status uniquely.
...
Also code cleanup/simplification in the getDescriptiony areas.
2014-06-21 19:08:52 -04:00
Inusaito Sayori
d87a48ea06
Group Bans!
...
Thankies Baker Linden~
Ported Ansariel's mAvatarNameCacheConnection change to mAvatarNameCacheConnections to llpanelgroupbulkimpl.h
Adds setGroupID in places, in case we ever want to add that.. but for now we don't really need/use it
Adds Refresh_Off icon from upstream.
Viewer Interesting changes:
Moves LLGroupChange out of stdenums.h into llgroupmgr.h
Moves roles_constants.h from llcommon into newview
This looks like it's better without space changes...
2014-06-21 16:44:39 -04:00
Inusaito Sayori
b36bb8b5bb
Increase the maximum range of finding avatars to invite near the user
...
Increased from 40 to 8192, so it works across sims and all the way up.
Also made the value editable, and the slider is now as wide as the list which looks nice.
2014-06-21 15:05:46 -04:00
Inusaito Sayori
2ed16c9736
Right click menus in avatar picker lists and in group invite avatar list.
2014-06-21 15:02:20 -04:00
Inusaito Sayori
c031649979
Added Eject avatar from group notification from v-r.
2014-06-20 18:01:59 -04:00
Inusaito Sayori
e0746fca12
Sync up llgroupactions with v-r/rlv.
2014-06-20 15:53:54 -04:00
Inusaito Sayori
2075042ba7
Fix key2name not working on the first try. Also make it comply with the name system choice.
2014-06-19 12:48:00 -04:00
Inusaito Sayori
499cd48763
More touches for DS3 support.
2014-06-19 11:29:18 -04:00
Inusaito Sayori
5d826b2b62
Use Nebadon's defaults for the Ouya game controller.
2014-06-18 21:32:31 -04:00
Inusaito Sayori
b20943d497
cd36a1fe16 had some mistakes/missing pieces
2014-06-18 21:07:15 -04:00
Inusaito Sayori
b4ab9a4e57
Fix cursorZoom being broken, my bad, forgot to add the increment line
2014-06-18 20:35:03 -04:00
Inusaito Sayori
cd36a1fe16
Add MotioninJoy detection, along with a whole new control set for it.. plus bonus buttons!
...
Tilt up to go up/jump, tilt down to go down/crouch (flying works nicely this way)
Turn left to roll left, turn right to roll right, while in flycam only.
Controls are mapped to the same buttons as with xbox controller.
Bonus buttons:
PS3 Logo button: Toggle Sit!
L2 and R2... no idea what to make these, I'll come up with something
2014-06-18 20:32:28 -04:00
Lirusaito
1cda80cbe7
Introduce function isXboxLike, to support Xbox-like controllers, even if they don't identify as Xbox.
...
Support for Ouya controller added.
2014-06-18 16:15:48 -04:00
Latif Khalifa
ffd0e6b79d
[Branding] Linux scripts now made from template by cmake
2014-06-18 18:35:29 +02:00
Inusaito Sayori
a7728b87fc
Touchup-fix for Issue 1549: Keyboard camera panning only works in 3 directions using WASD keys.
...
I didn't like the way Advanced menu flickered, so I provided a setting to prevent the toggle that way altogether.
Adds LiruUseAdvancedMenuShortcut
2014-06-18 09:47:08 -04:00
Inusaito Sayori
c218789abc
Repeats per meter goes negative when flipping, let it be modified while in the negative without clamping to a positive minimum.
2014-06-18 09:32:59 -04:00
Inusaito Sayori
3656cb9fdb
MAINT-4001 : Make Received Items not movable (protected), consolidate Received Items folders which may have been moved
...
Work by Merov Linden.
2014-06-18 08:05:49 -04:00
Sim Federal
e93fdf4615
Added region positions to the world map tiles
...
This feature added the setting 'SFMapShowRegionPositions'
2014-06-17 14:06:42 -05:00
Inusaito Sayori
6722e25cbe
Fix Issue 1182: Script Window Resize Issue
2014-06-17 13:36:29 -04:00
Lirusaito
790db4283c
STORM-2018: Group invite fails to let you join groups when groups maxed even when you leave group
2014-06-17 12:57:52 -04:00
Lirusaito
a0359473ff
STORM-2011: Group member lists not loading properly
...
Work by Ansariel
For us, this is just to disconnect properly, we didn't have this because it was broken.
2014-06-17 12:56:43 -04:00
Lirusaito
ccfdcce5c1
MAINT-3187: Name list controls do not properly resolve avatar names
...
Work by Ansariel
For us, this is just to disconnect properly, we had this commented out because it was broken.
2014-06-17 12:54:26 -04:00
Lirusaito
811849fa23
Attempt to fix Issue 1154: Streaming Audio Display no longer stays enabled across relogs
2014-06-17 12:51:04 -04:00
Inusaito Sayori
1051fd9d42
Feature Request: Show how many scripts are actually running when doing a script count (also shows mono!)
2014-06-17 11:39:03 -04:00
Inusaito Sayori
5490a992ca
Revert "[Preferences Refactor] Remove window size combo box from graphics preferences"
...
The issue wasn't the resolution box, and it apparently has its uses.
This reverts commit ac106b0aff .
Conflicts:
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
2014-06-16 21:43:43 -04:00
Inusaito Sayori
2d29fb8d15
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-06-16 16:09:29 -04:00
Aleric Inglewood
589035c1db
Attempt to fix gray avatars on mobile networks.
...
Ported from
e879862791
2014-06-16 21:02:27 +02:00
Shyotl
8f6a578ec0
Migration to LLMatrix4a instead of glh::matrix4f
2014-06-15 22:42:32 -05:00
Inusaito Sayori
a2fcf4edac
Touchup to export perm enablement in default permissions
...
(not convinced this feature is working, though)
2014-06-14 23:18:48 -04:00
Inusaito Sayori
f56ac5210c
[Warnings] Fixed warnings that Friti reported, thanks friti!
2014-06-14 18:21:20 -04:00
Inusaito Sayori
576069a84d
Fox knot
2014-06-14 16:26:29 -04:00
Inusaito Sayori
7ea7d4cf6c
Fix any and all crashes relating to initialization of UI components that may need the name cache to be initialized already.
2014-06-14 15:40:36 -04:00
Inusaito Sayori
21e1359b37
Confirmation for removing users, also reposition the remove button icon
2014-06-14 15:38:33 -04:00
Inusaito Sayori
eebee9b7c1
[STORM-68b] Default permissions floater overhaul
...
Adds separated default permissions for Objects, Uploads, Scripts, Notecards, Gestures and Wearables.
Compatible with Export Permission
Backwards compatible with default permissions for objects on regions where AgentPreferences capability is not available (opensim users rejoice!)
These changes to llfloaterperms are made available under lgpl, if there's a v3 that wants to adopt default export permission for opensim.
2014-06-14 15:32:50 -04:00
Sim Federal
bfc986a97d
Fixed the spamming of has left sim
...
Bumping into the edge of a region without
a neighboring simulator would spam has left
and has entered the sim. This will now check
if the position is a valid global, if position not valid
then it will assume you're still in the same simulator.
2014-06-13 04:20:17 -05:00
Inusaito Sayori
d65a52242e
Fox a small mistake in the last commit.
2014-06-13 05:12:41 -04:00
Inusaito Sayori
c82c791061
Whoops, that was C++11, that won't work for Linux and Mac. (code change only)
2014-06-12 08:51:54 -04:00
Inusaito Sayori
bcd18a01d8
[Preferences Refactor] In vanity->tags, remove color swatch disable logic since it doesn't make much sense anymore and isn't refreshing soon enough.
2014-06-12 07:26:04 -04:00
Inusaito Sayori
53a4931974
Group feature request: add ability to not turn when right clicking on objects
...
Adds RightClickTurnsAvatar to debug settings, defaults to true.
2014-06-12 06:13:33 -04:00
Inusaito Sayori
1f7751618e
Solve Issue 1541: Remove old Logins
...
Little trash button next to the username box added, as its tooltip explains, if you have a valid entry selected and you click it, that entry will be removed.
My test avatar was a fake entry by the name Garbage Tax
Just thought I'd give that to the googles... enjoy~
2014-06-12 01:27:54 -04:00
Inusaito Sayori
497babe8e9
Fix Issue 1540: SLURLs not openable from chat?
2014-06-11 20:52:47 -04:00
Inusaito Sayori
973a90a34d
Address Issue 1063: Compatibility azerty
...
It's dynamic, no need to relog!
Look under input preferences for "Use azerty layout instead of qwerty layout"
2014-06-11 20:02:34 -04:00
Inusaito Sayori
3cff5cd1a8
Only determine DumpDir in one place, LLDir::getDumpDir, not in llcrashlogger.
...
Also spaces tabs in getDumpDir
2014-06-11 14:36:41 -04:00
Inusaito Sayori
8766335708
Up the maximum field of view to 320, from 175, on request from Tazy Scientist
...
Better for reallllly wide screens and multiscreen setups, apparently.
Also, let's merge with v-r while we're at it, since llcamera.h requires a large-ish recompile
Nothing functional though.
And some license updates to some identical files in llmath.
2014-06-11 03:24:46 -04:00
Inusaito Sayori
908fc939b1
Feature Request: Next owner perms for scripts
...
In System->Building preferences, on the top right side.
2014-06-10 11:23:27 -04:00
Inusaito Sayori
73c4557a45
STORM-1117 does not affect us, allow calling cards in prims
...
Issue was due to v2 name resolution, our calling cards are old school and don't do this.
2014-06-10 08:51:09 -04:00
Inusaito Sayori
accfcbbf5c
Restore the old behavior of not derendering muted people
...
This can be switched off with LiruLegacyDisplayMuteds in debug settings.
People have been annoyed that muted avatars disappear, and since we have the derender system anyway..
Also Sync llvoavatar.cpp with v-r a bit
(okay, fine, alot)
2014-06-09 10:10:03 -04:00
Inusaito Sayori
5a36450e01
Allow multi-select for participant lists, for multi-user operations via right click menu.
2014-06-09 06:54:53 -04:00
Inusaito Sayori
839f4eab7e
Feature Request: chatbar as commandline "/regionsay msg" to do region-wide messages without needing to go through the region/estate floater.
2014-06-09 06:50:48 -04:00
Inusaito Sayori
fec0559d11
Introduce debug setting, LiruNewMessageSoundIMsOn, for defaulting ding of new IMs on.
...
This setting is off by default and I don't intend to give it a gui yet.
It probably will go in Chat UI, eventually.
2014-06-09 00:02:54 -04:00
Inusaito Sayori
e46fc0a805
Portability Mode!
...
Just add --portable to the shortcut
or use the provided shortcut as a template,
though it's likely the provided shortcut will not work on other computers, because the drive letter will change
2014-06-09 00:00:43 -04:00
Inusaito Sayori
fb7751360c
Update Windows 64-bit Hunspell, thankies Drake~
2014-06-08 20:42:26 -04:00
Inusaito Sayori
0c2e7d7028
Pressing up on right stick should turn the camera up in flycam, logically. (xbox controller)
2014-06-08 09:05:39 -04:00
Inusaito Sayori
fe2e68b410
These defaults seem more effective for my DS3 in flycam.
...
If anyone has a real XBox 360 controller and doesn't like them, let me know, we can totally work together on this
2014-06-08 08:23:48 -04:00
Inusaito Sayori
166c4df0b3
No more gross grey bars on the sides of snapshot thumbnails!!
...
Also random snapshot floater code sync with upstream in small places because it'll need doing at some point..
2014-06-07 11:50:31 -04:00
Inusaito Sayori
68684855c6
Bump link num starting point from 0 to 1
...
Based on script testing, and the fact that the root prim is 1, not 0.
2014-06-07 06:30:52 -04:00
Inusaito Sayori
fa0de18ffe
[Voice Update] Small sync, less warning spam is likely
...
Should fix group chats sometimes not showing anyone. (Seemed to for me! ^*^)
2014-06-07 06:27:36 -04:00
Shyotl
24ca32f9f7
Replace gluProjectf/gluUnprojectf with own versions. Also changed gGLModelView/gGLProjection and other related matrices to LLMatrix4a.
2014-06-06 01:59:04 -05:00
Inusaito Sayori
f63de0d0cc
Feature Request: Make Inspect button a toggler~
2014-06-05 23:54:15 -04:00
Inusaito Sayori
f6db6058e1
Mass fixup to appearance mode ui overhead!
...
Should contain no functional changes, ust that all ui in appearance mode is now cached instead of calling getChild per frame.
Switches from hiding min/max param text every frame to force-drawing in draw call and setting invisible (llscrollingpanelparam.cpp/the corresponding xml)
Cleans up some old commented out code.
Moves some simple, one-call functions into their calling bodies.
Also, for some reason I had to adjust the alpha checkboxes, totally confused why they were out of line... maybe they had been already? I don't see a changed line that did positioning.
Contains spaces to tabs fixes, please view without space changes (You have been warned!)
2014-06-05 21:41:59 -04:00
Inusaito Sayori
d23632ef46
[RLVa] Yay updates~
...
e4a6e0d257c1 - fixed : @recvim=n isn't actually blocking the incoming message
35869fc884e9 - internal : minor refactoring of the process of updating the navigation and top info bars when toggling @showloc
9688630000ad - changed : show a limited context menu in the nearby people panel when @shownames restricted
-> "Offer/Request Teleport" (filtered)
$ Singu Change: Adds Recording of teleport offers to chat (if sending less than 10), one day I'll get around to doing this right into IMs
Noticed RLV.EnableIfNot was not being used, so I plugged it in for windlight.
Future Note: This brings us up to 417d759f0fa9 on the RLVa tree.
2014-06-03 20:29:55 -04:00
Inusaito Sayori
1048f213c7
Fix maximized windows being repositioned to no longer maximized when applying graphics settings.
2014-06-03 00:56:24 -04:00
Inusaito Sayori
98d88bff94
[Preferences Refactor] Oops, that shouldn't be there.
2014-06-02 23:41:03 -04:00
Inusaito Sayori
861fccd2d6
Address Issue 1301: Depth of Field preferences
...
Thanks a lot to Niran for assistance in this. Tooltips are from Black Dragon's machinima panel.
Note: Moves Depth of Field checkbox into the new Depth of Field tab.
2014-06-02 23:40:35 -04:00
Inusaito Sayori
715c3b8510
[Preferences Refactor] Cleanup on llfloaterpreferences
...
Moves to calling refreshEnabledState directly from LLPanelDisplay instead of bouncing around in LLFloaterPreferences first or using static proxy functions
Cleans up unused cached button pointers and old style static callbacks.
2014-06-02 23:24:25 -04:00
Inusaito Sayori
3c6c7c4138
[Preferences Refactor] Further cleanup
...
Moves to visibility_control and enabled_control instead of using callbacks, this lightens the load on opening preferences, and makes them responsive even to debug settings changes
Removes the moving m for meter text with draw distance, I don't think anyone cares if it's a little to the side of the number.
Adjustment of tabs to spaces in xml.
Return early when disabling unavailable settings if shaders are unavailable.
Cuts back on single-call functions in favor of direct binds.
2014-06-02 23:20:30 -04:00
Inusaito Sayori
95106ca1c2
[Preferences Refactor] Handle Hardware tab earlier to avoid early return when custom isn't displayed
2014-06-02 20:25:01 -04:00
Inusaito Sayori
ac106b0aff
[Preferences Refactor] Remove window size combo box from graphics preferences
...
Windows can be resized on their own, we do not need this box
This should also fix window resizing when applying preferences.
2014-06-02 20:22:15 -04:00
Inusaito Sayori
001e45627b
Feature Request: Add an option to toggle Animating when going into Appearance Mode, option is in vanity->main preferences
2014-05-30 06:38:13 -04:00
Inusaito Sayori
b8c3457644
Set RenderTextureMemoryMultiple to 1.0 on Macs, because the people asked for it.
...
If this explodes, I'm sure we'll see issues reported against it soon,
but in private testing we've yielded nothing but good results.
2014-05-29 22:43:55 -04:00
Inusaito Sayori
5f6dcfa82a
[UI Overhaul] Restore LLContextMenu::appendContextSubMenu definition, lost in last commit. (Thannks for catching this, Tazy!)
2014-05-29 20:12:31 -04:00
Inusaito Sayori
f2dd944acd
[UI Overhaul] Migrate LLContextMenu (and LLPieMenu) to the bottom of llmenugl.cpp to better diff with upstream.
2014-05-28 23:33:53 -04:00
Inusaito Sayori
d0f69ebb75
[UI Overhaul] LLMenuGL sync: doIt() --> onCommit()
2014-05-28 23:03:00 -04:00
Inusaito Sayori
04737fb0e8
[UI Overhaul] Missed this in c640585
2014-05-28 22:59:52 -04:00
Inusaito Sayori
d78550e83e
Introduce APP_SITE for easy rebranding of viewer website from strings.xml.
2014-05-28 22:54:40 -04:00
Inusaito Sayori
c640585bc3
[UI Overhaul] Introduce LLMenuGL::insert from upstream and remove append/addChild wrappers in favor of insert
2014-05-28 22:52:29 -04:00
Inusaito Sayori
a926cdc5be
[UI Overhaul] LLMenuGL sync
2014-05-28 22:08:01 -04:00
Inusaito Sayori
43e66b57a0
[UI Overhaul] Scrollable Menus.. just the implementation for now, not actually used.
...
This worked initially(early testing yesterday), but since then it seems not to, either way, implementation part is out of the way, so committing.
2014-05-28 21:50:18 -04:00
Shyotl
ee60a9801b
Appease some nVidia cards/driversets regarding skinned shaders.
2014-05-27 20:18:48 -05:00
Inusaito Sayori
fb69220b95
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2014-05-27 12:57:45 -04:00
Inusaito Sayori
1cf7f67af5
Viewer name branding fixes, make rebranding way easier.
...
Also fix up french menu leaving functions around..
2014-05-27 12:54:33 -04:00
Latif Khalifa
8497ba1898
Use @style@ cmake escapes for the linux wrapper script
...
This avoids cmake messing up shell variables
2014-05-27 17:39:37 +02:00
Lirusaito
234259da91
Fix Issue 1299: Default Build settings for transfer permission not applied to a newly rezzed box
...
Mostly a workaround for next owner transfer being on by default
2014-05-26 13:51:41 -04:00
Lirusaito
ef7f309012
Redundant check is redundant
2014-05-26 09:32:50 -04:00
Lirusaito
d372fa1a0f
Whoops, fixup locally experienced crash with lookat beacons.
2014-05-25 14:47:45 -04:00
Lirusaito
ea9005868b
Switch out bumpers being roll for bumpers being y axis (up/down) with the xbox controller
...
This seems more widely used, and roll does nothing in Avatar movement so this is more useful
If people want it the other way, they can just switch it themselves.
2014-05-25 12:57:48 -04:00
Lirusaito
0a3a4a51bd
Feature Request: Add an option to "Make rightclick zoom instantaneous, not smooth" (in Input & Camera preferences)
2014-05-25 12:44:48 -04:00
Latif Khalifa
1dbd913d9d
Branding: generate wrapper script with cmake
2014-05-25 18:18:47 +02:00
Latif Khalifa
22cded7ccc
Made breakpad symbols generation branding neutral
2014-05-25 08:27:00 +02:00
Latif Khalifa
4851f1ad48
Branding support for Linux packaging
2014-05-25 04:07:34 +02:00
Inusaito Sayori
0d94dd7bf8
Pick up a few changes from Alchemy for LookAt beacons
...
Implements lines from avatar to their lookat beacons
Implements namesystem so that Display Names can also be shown with beacons instead of just legacy
New options are available in the Security & Privacy tab of System preferences
2014-05-24 05:26:32 -04:00
Inusaito Sayori
bbe7f6adfb
Enable Multiselect in groups, and enable EditMenuHandler when a scrollable list is focused!
...
Allows Ctrl-A to select all in a list (Like for selecting all groups and unticking chat with a single click)
Ctrl-E to deselect
Ctrl-X/Ctrl-C to copy a list (useful for saving ban lists and such!)
2014-05-23 19:37:32 -04:00
Inusaito Sayori
828941a204
Meeting Request: Pick up LL's changes to land impact (Also introduces Land Impact floater)
...
Small change to lltextbox allowing us to use value attribute with <text/>'s YAY!!
Cleaned up in llfloatertools as well to better diff.
2014-05-23 06:19:43 -04:00
Inusaito Sayori
2ce3f2c131
Meeting Request: Display date not just time in Teleport History
...
Will not change old entries because of the stupid way teleport history is saved.
Seriously, this floater needs a rewrite... we should just use v3.
2014-05-23 03:39:35 -04:00
Inusaito Sayori
8943552c1c
Meeting Request: Change System Preferences' Security tab to Security & Privacy
2014-05-22 19:58:16 -04:00
Inusaito Sayori
dadbb00b85
Introduce a setting for Automatically scrolling to the bottom of a chat when the chat gains focus
...
Preferences->Adv. Chat->Chat UI, Autoscroll to the end of chats when they regain focus.
This defaults to false, unlike the legacy behavior.
Partial revert of "Feature Removal!: Do not scroll to the end of chats when the corresponding chatbar regains focus!"
2014-05-22 19:46:15 -04:00
Inusaito Sayori
852a8407c8
Feature Removal!: Do not scroll to the end of chats when the corresponding chatbar regains focus!
...
Focus is given to chatbar on floater focus, so this got in the way.
This feature was never really worth it.
2014-05-21 22:57:08 -04:00
Inusaito Sayori
bfbbcad8e5
Feature Touchup: Add backup destination to Emergency Teleport out of region within last 20 seconds before restart feature
...
Falls back if first landmark is not in inventory or invalid, region is offline, or the current region is your location
Item drop target is right below the original one in System->Security prefs.
Thanks again to the citizens of Fluffy for enduring these restart tests.
2014-05-21 19:07:11 -04:00
Inusaito Sayori
c684987908
Fix bugs introduced in 77a13963bb
...
Fixes Shiny/Bumpy combo boxes being broken
Fixes UI warning for "label glossy" not existing, it was "label glossiness".
2014-05-20 23:37:59 -04:00
Melanie
d0c66e5efb
Actually hide the export box on SL. Must have been asleep when I coded that.
2014-05-19 14:59:07 +02:00
Shyotl
53b8f70de8
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-05-17 18:26:07 -05:00
Shyotl
a1eb30ae87
Keep old non-swizzle method around since GL_ARB_texture_swizzle has poor support prior to 3.3 (on osx especially)
2014-05-17 18:25:21 -05:00
Shyotl
c4cb9de44b
Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git
2014-05-17 16:30:21 -05:00
Shyotl
0a89503edd
Renamed glUniformMatrix3x4fvARB to glUniformMatrix3x4fv, since I don't think it ever had the ARB postfix. Also use its the properly named (although identical to the current) function pointer signature.
2014-05-17 04:04:33 -05:00
Shyotl
f12bd741e2
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
...
Conflicts:
indra/newview/llvopartgroup.cpp
2014-05-17 03:40:10 -05:00
Shyotl
e35039faf7
Remove deprecated gl call in renderComplexityDisplay.
2014-05-17 03:34:33 -05:00
Shyotl
a756943628
Fix a LLVertexBuffer::validateRange call that I hosed up pretty badly.
2014-05-17 03:33:33 -05:00
Shyotl
a9c3e13e5e
Removed some diagnostic spam pertaining to shaders.
2014-05-17 03:32:40 -05:00
Shyotl
67c8ac2b04
Skinned shaders were exceeding maximum amount of vertex uniforms on amd hardware.
...
-Changed the transform matrix uniform to a 3x4 matrix and packed translation into it to free up uniforms. (3x3 is converted to 3x4 internally, so we were needlessly eating 3*52 extra uniform slots. translationPalette might also have been treated as a vec4 internally too, wasting 52 more slots.)
-matrix3x4 requires opengl2.1 and newer, so added a new featuretable mask.
-Also added a featuretable mask to disable hardware skinning and deferred shading on hardware with less than 1024 vertex uniforms.
NOTE: On old old old amd hardware, evidently a 3x4 matrix might be upgraded to 4x4. I'm unsure, but I doubt such hardware has 1024+ uniform components available to begin with. 4x3 supposedly doesn't do this, but opengl is column-major, so this makes little sense.
2014-05-17 03:31:45 -05:00
Inusaito Sayori
82044399e4
Brought in Realistic Mouselook option from Black Dragon
...
Look at the top area of Input & Camera preferences
Aside from tweaks to the code, all credit to Niran.
2014-05-15 21:01:11 -04:00
Shyotl
fdcf2eda5a
Decouple vbo validation from LLDrawInfo. Such required vbo's to be initialized before drawinfo creation/modification, which is no longer the case with llvovolume. ('RenderDelayVBUpdate'[although removed in Singu] also fails the same assumption.)
2014-05-15 18:44:10 -05:00
Shyotl
e0997f1f04
Decouple vbo validation from LLDrawInfo. Such required vbo's to be initialized before drawinfo creation/modification, which is no longer the case with llvovolume. ('RenderDelayVBUpdate'[although removed in Singu] also fails the same assumption.)
2014-05-15 18:39:35 -05:00
Inusaito Sayori
58859ee709
Minor touchups to spanish translation
2014-05-15 17:36:33 -04:00
Shyotl
c3771e2fd5
Removed unused preprocessor definition in objectSkinV.glsl
2014-05-15 16:23:14 -05:00
Inusaito Sayori
2e49365b0f
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2014-05-15 15:37:42 -04:00
Inusaito Sayori
cd87aadab3
Missed a spot.
2014-05-15 00:42:22 -04:00
Inusaito Sayori
e58f8856f4
Add support for Controller Keys, inspired by similar code by CtrlAltStudio Viewer
...
Dear Alpha Users who are curious about this:
A = Alt
B = Shift
X = Ctrl
Y = Escape
Back = Toggle Flycam mode (Use this, it's fun!!!)
Start = Toggle Cursor mode
Right Stick Click = Toggle Mouselook
Left Stick Click = Jump/Fly
Enjoy, I know I do!
2014-05-14 23:48:27 -04:00
Inusaito Sayori
18a48e6609
Fix the inverted mouse issue.
2014-05-14 23:16:55 -04:00
Inusaito Sayori
929b75989c
Sync with alchemy/v-r for flying instead of jumping on button press (Left Stick Click)
2014-05-14 22:58:16 -04:00
Shyotl
7d98030edc
Use the right diffuse shader for skinned deferred diffuse simple object shader.
2014-05-14 19:43:03 -05:00
Shyotl
846d573dd0
Kill stray #endif that snuck into commit.
2014-05-14 16:45:55 -05:00
Shyotl
5805fe636a
Determine if to stuff shiny data into alpha component a bit differently. Cuts out a lot of crazy logic and lets us choose based off of target renderpass.
2014-05-14 03:38:16 -05:00
Shyotl
3db9c6a9ff
Try mask-based object shader configuration, instead of a bazillion hard-coded shader globals. Should be a bit more consistent. (non-deferred only, for now)
...
Also abuse discard in alpha shaders, instead of processing invisible fragments.
2014-05-14 03:30:02 -05:00
Shyotl
22bcf83cb9
Toyed with gl init ordering. Fixes adaptive vsync. May explode on linux, not that adaptive vsync works there, but it should in theory work there if we ever port to sdl2. If it does explode, I'll know shortly... probably.
2014-05-14 03:10:34 -05:00
Shyotl
117eca3c98
Try some swizzling instead of forcing everything to rgba8 with core profile. Avoids manual conversions with scratch buffers. Works for all pixel datatypes. Cleaner. Uses less vram.
...
Also, fixed textures when running core pofile.
2014-05-14 03:05:53 -05:00
Inusaito Sayori
81affe719f
Add a setting to automatically decline and leave incoming conferences
...
Look under Communication preferences for "Block incoming conference chats" to activate.
2014-05-14 03:34:32 -04:00
Inusaito Sayori
3febec4aa4
Merge up CtrlAltStudio and Alchemy for XBox360 support
...
Can't seem to get scrollies working in cursor mode, odd.. need to look into that.
I need to figure out if inverted Y axis is just for me on my Dual Shock 3, though it seems to work usually... if this is the case I might flip it in the code.
More work needs to be done to get ctrl/alt/shift support from CAS, too.
I just wanted to get today's work out of the way and wrapped up, so here it is.
2014-05-14 02:23:55 -04:00
Inusaito Sayori
a78c6072ce
Sync llviewerjoystick with upstream sources.
...
Replaces old constant of dividing by 3 with debug setting for multiplying: FlycamBuildModeScale
Relicenses to lgpl.
2014-05-13 21:27:18 -04:00
Lirusaito
aa6a57be63
Remove "wanna->want to" from auto replace, it is stylistic.
2014-05-12 19:26:16 -04:00
Inusaito Sayori
fd29dd9508
Spaces to Tabs for Last commit
2014-05-09 22:19:52 -04:00
Bob Shaffer II
5080ebf88f
reverting some changes to llvovolume that seems to break animated textures
...
Signed-off-by: Siana Gearz <siana.sg@live.de >
2014-05-10 03:13:15 +02:00
Siana Gearz
873df7805b
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-05-10 03:12:32 +02:00
Inusaito Sayori
009fb10927
Feature Request: Add AutoresponseOnlyIfAway to send autoresponses only if in AFK or FakeAway modes
2014-05-09 20:32:38 -04:00
Inusaito Sayori
3898d29741
[Preferences Refactor] Touchup on voice prefs borkage.
2014-05-09 20:31:05 -04:00
Siana Gearz
1c521a3743
Merge branch 'master' of https://github.com/lkalif/SingularityViewer
2014-05-09 22:18:10 +02:00
Siana Gearz
098d1b30ff
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-05-09 22:15:38 +02:00
Siana Gearz
484108dafc
Fix VS2012 64-bit debug build
2014-05-09 22:14:47 +02:00
Inusaito Sayori
029d260ad8
Feature Request: Persistent setting for AllowSelectAvatar (su useful!)
2014-05-09 10:39:07 -04:00
Inusaito Sayori
e6bc8f8583
Enable custom and window resolution for snapshots to inventory and set the max size to 1024, not 512. -- on request of Vivena (and the in-world group as a whole)
2014-05-09 09:30:13 -04:00
Inusaito Sayori
77a13963bb
Joint effort with Alchemy Viewer to make build floater a lot lighter on FPS
...
Gets rid of all those pointless callbacks and static workarounds for legacy callback system.
Should massively improve FPS while build floater is open
Fixes getChild UI Warnings
Removes dumb func
2014-05-09 06:40:53 -04:00
Inusaito Sayori
656eacbb09
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-05-08 19:57:01 -04:00
Shyotl
98f9a09b39
sunlight_color_copy need only be vec3.
2014-05-08 16:39:41 -05:00
Shyotl
7e8e8bdb26
Disable some diagnostic gunk eating memory.
2014-05-08 16:35:12 -05:00
Shyotl
e2a0f801b9
Have LLRender::color4ub fall back to uniform if bound vbo lacks color attribute. Fixed fixed-function call in LLFacePool::LLOverrideFaceColor::setColor.
2014-05-08 16:29:53 -05:00
Shyotl
75b31b4151
Fix a nullptr usage.
2014-05-08 16:24:24 -05:00
Shyotl
f0763fd31c
Tweaked context-recreation logic to force a 0xAA context when fbos are in use. Should also handle toggling of fbo checkbox a bit gracefully as well.
2014-05-08 15:48:08 -05:00
Shyotl
162e7b7699
Fixed a silly mistake that was causing vsync to be enabled when it should have been. Also fix typo in objectSkinV.glsl previous commit
2014-05-08 15:30:02 -05:00
Shyotl
7158a3c83d
Fixed an annoying showstopper regarding rigged attachment vertex corruption. Rigged meshes have can have poor weighting, causing potential div-by-zero issues.
2014-05-08 15:11:12 -05:00
Inusaito Sayori
1fa30dd337
Fix Issue 1502: The Builders' Brewery says our prim torture behavior is nonstandard
...
Our uictrl limits were in need of a quick tune-up.
2014-05-07 06:54:17 -04:00
Inusaito Sayori
250049537f
Feature Request: Add option to autominimize the region restart floater And Allow changing/shutting off its sound (from gui)
...
These new options are at the bottom of System->Security preferences.
2014-05-07 06:53:35 -04:00
Inusaito Sayori
76e5311320
[Preferences Refactor] Cleanup of voice prefs code
...
Also attempt to add a local enablement control, it's not quite clear where these are supposed to hook in, so it's unused for now, but it would have replaced onCommitEnableVoiceCheck.
Also fix the location of the voice is disabled textytext, it was too on top of the next checkbox.
2014-05-07 03:52:14 -04:00
Inusaito Sayori
11098cd6d4
[Preferences Refactor] Clean up of useless code for enablement and callbacks.
...
This tag will be used for refactor and updating of most of our preferences panels:
This will include code changes that remove or condense old code
This will include preferences being moved around to more logical locations
This may include splitting up and/or condensing of tabs and/or subtabs for more logical placement of preferences
This may include code changes that allow making changes to preferences faster and easier
This will not include adding preferences
2014-05-07 03:20:04 -04:00
Siana Gearz
78a0b347fc
Fix 64-bit project generation under Cygwin
2014-05-04 08:05:05 +02:00
Latif Khalifa
08a23de051
Restore compiler warnings flags.
...
Previous work on enabling the build on the latest Mac OS and
Xcode compiler mistakenly took out compiler warning flags.
This restores previously used flags.
Issue noticed by Sovereign Engineer.
2014-04-30 07:29:23 -07:00
Inusaito Sayori
a02ad53c73
Fix bulk import of notes, scripts and gestures, and clarify file menu
2014-04-28 20:36:46 -04:00
Inusaito Sayori
9400701c96
Synced up llviewerobjectbackup with Cool VL Viewer
...
Benefits:
-Support for exporting Materials (Normal and Specular textures)
-Fixed support for Object Physics export
-Fixed support for Light Image export
-Switch to use of Boost unordered containers
-Checking for invalid perms on textures is now optimized by saving invalid ids to a container
-GravityMultiplier parameter is now Gravity because that just makes way more sense.
-We support export of legacy flag parameters again to be compatible with older viewers
-Code comments are now a little clearer
-We now wait a little if objects haven't loaded yet when we try to export them
-We no longer allow changing default texture ids via debug settings on opensim regions that support the export permission
-Bit of reordering to better diff with Cool VL Viewer, since it's essentially our only upstream.
-Removes dead code/commented codestuffs
Please view the diff without space changes, otherwise you'll lose your mind.
Merci Henri!
2014-04-28 17:48:39 -04:00
Latif Khalifa
aa983108e8
Possible fox for crash signature 5284 by Aleric
2014-04-28 21:12:37 +02:00
Damian Zhaoying
7dca333166
Update spanish translations. Add translations for news floaters, dinamyc toolbars, RLVa and autoreplace.
2014-04-28 15:51:48 -03:00
Lirusaito
0f1ecf66ab
Possible Fix for Issue 1499: Login screen disappears on non-SL grids after logging failure
...
Also should fix when this would happen on poor/dead connections.
2014-04-27 18:50:37 -04:00
Lirusaito
74984b5a3c
Further cleanup of im floater draw call due to last commit
2014-04-27 18:46:50 -04:00
Latif Khalifa
c5d5984885
Checking for ChatSessionRequest cap is not neccessary for establishing private voice calls.
...
Addresses issue 1293
2014-04-27 21:37:52 +02:00
Damian Zhaoying
c1ccfcb988
Merge remote-tracking branch 'Liru/master'
2014-04-27 13:53:47 -03:00
Lirusaito
51dc0550d5
Minimap mark colors touchup
...
Now shown in tag without tag color statuses needing to show.
2014-04-27 11:18:31 -04:00
Lirusaito
ac9e36549b
Fix right clicking dots no longer working on the minimap, broken {} pair that slipped my eyes.
2014-04-26 18:08:19 -04:00
Lirusaito
009e9a598a
Introduce ExodusMapRolloverCircleColor for controlling the color of the new minimap selection circle, turn the alpha to zero to make it disappear completely (it's already quite light now)
2014-04-26 18:07:28 -04:00
Lirusaito
1502ef2661
Fix for an internal crash, could only happen if settings were copied into install improperly, but better safe than sorry.
2014-04-26 10:19:04 -04:00
Lirusaito
40f9e12bdf
Fix for Issue 1472, prevent what was probably a null pointer in a bind
...
Oddly, this only happened to some people, but on any OS, which leads me to believe that initialization order may need some looking at, but that's not terribly important now.
Removes toolbar toggle from floater dictionary, in favor of using setting toggle
Since we could always just hook up a control to a button if we wanted to add such a button somewhere anyhow, this has no effect on future either.
2014-04-26 10:17:47 -04:00
Lirusaito
2fc783e67e
The people want link parsing on! Let them have links in all text editors that aren't allow_html="false"!
2014-04-26 09:47:56 -04:00
Inusaito Sayori
4f8e6a188a
Bypass canClose check for new groups by calling onClose directly. (Fixes making new groups!)
2014-04-25 11:52:25 -04:00
Inusaito Sayori
b0e44ad1bd
Solve Issue 624: minimap multiple selection tool
...
Adds a circle when you mouse over the minimap, beneath your cursor
-This circle is the effect range of your right click+mark
-Shift+scroll to change the size of this circle (ExodusMinimapAreaEffect)
-- Set the debug to 1 to have basically the same range as before (unless dots are stacked)
-This circle is also how many avatars are shown in the tooltip
-When this circle is over avatar dots, they change color (ExodusMapRolloverColor)
The menu functions still only work on the closest dot to your cursor on right click...
Thanks to Exodus for the majority of this code, the rest is my work and updates to be closer to LL in places.
2014-04-25 04:11:35 -04:00
Inusaito Sayori
4a630b1780
Make it clear that item drop targets are for items.
2014-04-24 22:12:20 -04:00
Inusaito Sayori
ffa5e6099d
Address Issue 1290: Bumps recorded in chat window
...
Adds debug setting AnnounceBumps and a toggle in Preferences->System->Security
2014-04-24 21:46:57 -04:00
Inusaito Sayori
8d1cd7008f
Fix bug of being unable to change group owned parcel's visibility in search.
2014-04-24 19:48:27 -04:00
Inusaito Sayori
31b5c5e9dd
Enter Export subpiemenu, no longer part of Tools
2014-04-24 19:47:17 -04:00
Inusaito Sayori
0e21a16c1c
[STORM-1980] Singu Special: Emergency Teleport out of region within last 20 seconds before restart
...
Look in System preferences under the Security tab, at the bottom.
Debug setting is EmergencyTeleportLandmark, reset to turn off.
Also, thanks to everyone in Fluffy who put up with the tests of region restart notifications today,
I know it was annoying, thanks especially to the EMs for allowing me a testbed.
2014-04-24 01:33:04 -04:00
Inusaito Sayori
f666384a1d
[STORM-1980] Part 3: Region Restarting camera shake reset also pokies at sound trigger
...
Don't send sound through the region, it's logically a UI sound. What even is that otherwise?
2014-04-24 01:25:52 -04:00
Inusaito Sayori
afacfcee94
[STORM-1980] Part 2: Floater and shakeyshake
...
Shake is off by default, turn on AlchemyRegionRestartShake to activate
2014-04-23 23:54:59 -04:00
Inusaito Sayori
7262bf96b8
[STORM-1980] Part 1: Notifications with timestamp and sound
2014-04-23 10:58:14 -04:00
Inusaito Sayori
3db489f4df
Feature Request: When someone is marked on the minimap have that color persist on the radar and their tags
...
Jus' look at dat color~
2014-04-23 02:50:51 -04:00
Inusaito Sayori
6526c28e47
Fixup for "Feature Request: On login, open Local Chat, Communicate, and/or Contacts"
2014-04-23 01:35:52 -04:00
Inusaito Sayori
e473b9bf10
Fix a common crash when people would upload invalid xmls
...
Ill-gotten xmls just don't parse the same way...
2014-04-23 01:05:32 -04:00
Inusaito Sayori
0bde458c27
Allow minimum Sun Size of 0.01 instead of 1, like Black Dragon.
2014-04-22 22:20:46 -04:00
Inusaito Sayori
66739ac820
Preferences touchup now that we have log launching on mac
2014-04-21 18:59:49 -04:00
Inusaito Sayori
4a3763d8d1
Feature Request/Bug Fix: On login, open Local Chat, Communicate, and Contacts if they were open last session.
2014-04-21 18:31:41 -04:00
Cinder
4230127459
De-brand currency exchange
2014-04-21 18:09:08 -04:00
Cinder
a4c672252d
Launch transcripts in external text editor on mac too
2014-04-21 18:05:45 -04:00
Lirusaito
d5d0473487
[LLMeshRepo sync] Fix mesh not loading
2014-04-19 01:09:12 -04:00
Lirusaito
9bbad1f8f0
[Warnings] Fix trigraph warning.
2014-04-19 00:47:02 -04:00
Lirusaito
0523965822
[LLMeshRepo sync] relwithdebinfo compile fixes
2014-04-19 00:25:11 -04:00
Lirusaito
cb8cd702e1
[LLMeshRepo sync] Linux compile fixy
...
Note to self: Windows compiler does not care about file casing, be more careful.
2014-04-18 23:51:52 -04:00
Liru
86b5737d51
[Floater Flexibility] French Translation~ Danke Nomade.
2014-04-18 09:17:41 -04:00
Liru
4027ec7a67
[Floater Flexibility] Fix yet another broken button, this time group titles, thanks again to the french singularity group
2014-04-18 04:58:49 -04:00
Liru
c2748a2246
[LLMeshRepo sync] The rest of the changes from upstream
2014-04-18 04:43:46 -04:00
Inusaito Sayori
5c06afc977
[LLMeshRepo sync] AICurl updates toward LLCurl
...
LLHTTPClient::getByteRange no longer throws AICurlNoEasyHandle, instead it returns whether or not it threw, to match the true/false convention of LLCurl.
- In addition, the header param has been shifted to earlier in this function to ease diffings.
ResponderBase now has static bool isGoodStatus, introduced into the Responder base class of LLCurl
2014-04-17 20:23:48 -04:00
Inusaito Sayori
4c82a5660f
[LLMeshRepo sync] Change camelcase LLConvexDecomp to lowercase, so mergetool is happy~
2014-04-17 18:20:34 -04:00
Inusaito Sayori
beacb5c701
[Floater Flexibility] Fix that the preferences button wasn't working, thanks Nomade for pointing this one out.
2014-04-17 15:47:50 -04:00
Damian Zhaoying
8355331cbe
Merge remote-tracking branch 'Liru/master'
2014-04-17 02:18:56 -03:00
Inusaito Sayori
dc9cb07a81
[Floater Flexibility] Part four: Added a floater to change buttons shown on the toolbar
...
View->Change toolbar buttons
Reuses the old FloaterUploadRect because I'm allowed to be lazy after creating this large control panel
2014-04-16 19:03:07 -04:00
Inusaito Sayori
57fe7d9ad0
[Radar] WHAT?! Why wasn't this committed last night? I know it was... what the heck...
2014-04-16 16:08:20 -04:00
Latif Khalifa
00336de59a
Merge branch 'osx_xcode5' of github.com:lkalif/SingularityViewer
2014-04-16 16:44:31 +02:00
Inusaito Sayori
b37b48f039
[Radar] Code overhaul
...
Brings a new "voice status" column, showing voice use as active speakers floater does.
- Shown by default, look in Extras tab to hide it
Attempt to blend and fix the visibility of the yellow for shout range.
- Requires user feedback, looks good on default and gemini to me
Refactors pretty much all of the code in the avatar list
-Less duplicate vars, less wasted space, more consistent spacing conventions, eradication of BOOL use.
We no longer add (or even evaluate what should be in) icon columns that are hidden
- This prevents icons from showing up even when their columns are hidden.
Minor work on focusing out of draw avatars, though that still won't work, sadly.
2014-04-16 05:30:19 -04:00
Latif Khalifa
42ca1a8994
[clang] Force build with SDK 10.6
2014-04-16 10:55:36 +02:00
Latif Khalifa
db678238ef
Merge branch 'master' into osx_xcode5
2014-04-16 09:56:57 +02:00
Lirusaito
861f88dd30
Awesomeness, yayayay! (allows XML changes in indra/newview/skins/ to count for viewer running from a directory in indra on Windows)
2014-04-15 20:06:08 -04:00
Lirusaito
77d42f1eb9
Attempt to cure stupid people being unable to untar properly over old versions without causing massive issues
...
(Gawd, that is not even proper installation process.... I need a drink)
2014-04-15 20:03:24 -04:00
Inusaito Sayori
364a13017c
Merge remote-tracking branch 'fairydust/master'
2014-04-15 19:57:31 -04:00
Latif Khalifa
8183deeb30
[xcode5] WIP: rebuilt clang friendly boost
2014-04-14 21:17:22 +02:00
Latif Khalifa
bb56d0a752
[xcode5] WIP: clang build fix
2014-04-14 21:16:24 +02:00
Latif Khalifa
41eafa4ede
[xcode5] WIP: build system changes
2014-04-14 21:14:42 +02:00
Inusaito Sayori
ce7629200f
Object Import/Export improvements
...
Support exporting "material" "clickaction" "flags" and "ExtraPhysics"
Support export of Light Texture feature, the expansion to Light feature.
Initial work to support firestorm's format.
Switched from exporting individual flags fields in favor of exporting one U32 field
- We still support the old single flag fields though we no longer export them.
2014-04-09 20:24:15 -04:00
Inusaito Sayori
5dca06d3d4
So then I said, "Compile, are you crazy?!"
2014-04-08 04:51:18 -04:00
Inusaito Sayori
b1d18c7f29
Address Issue 1298: Add Auto-replace text feature, borrowed from LL~
2014-04-08 02:12:51 -04:00
Inusaito Sayori
0b2d019e61
Latif's requested touch-ups for IM windows in concise mode.
...
Profile option for concise flyout.
Fix for ding in multi-user chats breaking button alignment.
2014-04-08 01:07:19 -04:00
Inusaito Sayori
ab0dde7fe8
[Floater Flexibility] Part three and a half: Toolbar code cleanup, toolbar in mouselook option
...
Go into Preferences->Input and Camera, to find the new option~
Thanks to Cinder for checking that the mac changes build and look nice.
2014-04-08 00:36:44 -04:00
Inusaito Sayori
ef01d2af82
Fix "zombie" lie and tabs/spaces inconsistency in xml.
2014-04-07 16:06:33 -04:00
Damian Zhaoying
08084799b9
Merge remote-tracking branch 'Liru/master'
2014-04-06 14:42:00 -03:00
Inusaito Sayori
3642e401da
Fix About and Toolbar prefs buttons being mushed together, thanks for the heads-up Friti!
2014-04-04 19:57:32 -04:00
Inusaito Sayori
094d284e62
Missed a git mv, mac should build after this.
2014-04-04 17:28:19 -04:00
Latif Khalifa
2c7459e08d
Supress bool/BOOL comparison warning
2014-04-04 21:29:41 +02:00
Latif Khalifa
315d2c4daf
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-04-04 21:21:00 +02:00
Aleric Inglewood
e61cabf1ce
Remove compiler warning.
2014-04-04 21:13:57 +02:00
Aleric Inglewood
994f409291
Attempt 2
2014-04-04 21:06:30 +02:00
Aleric Inglewood
7d124012c2
First attempt to fix windows compile errors.
2014-04-04 20:58:33 +02:00
Latif Khalifa
4d3c80e273
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-04-04 20:08:19 +02:00
Aleric Inglewood
a332a7fc35
Compile fix for motions backport.
2014-04-04 17:33:45 +02:00
Aleric Inglewood
2fb945a489
Fix floating point round off error bug that caused mAnimTime to be decreased in value.
...
Conflicts:
indra/llcharacter/llmotioncontroller.cpp
2014-04-04 15:22:18 +02:00
Aleric Inglewood
4d2517d163
Freeze also synchronized avatars when editing an attachment.
...
On the removal of permYouOwner():
Calling permYouOwner() to determine if an attachment is yours is
not correct: grid gods (and that includes BEFORE requesting admin
status) are marked as owner of everything in their sim.
The reason for that is that otherwise,
<Melanie_T> if they only had it when actually godding u, the viewer
would have to have an option to either show the proper menus (it
doesn't) or allow the sim to refresh the object flags without full
object updates (it hasn't).
<Melanie_T> gods often have to act fast, for instance with griefers.
Having transition to god mode take as long as a full rez just isn't an
option, apart from the sim load caused by resending all objects.
<Melanie_T> Then i tried resending only the object that was selected
but there the arriving object update would close the pie menu.
So you right-click a prim and the pie menu would close again.
The result has always been that if you are on your own sim, in opensim,
and select an attachment on another avatar, then YOU would freeze, not
the selected avatar. This patch fixes that "opensim related" bug as
well.
2014-04-04 15:19:50 +02:00
Aleric Inglewood
b4848f308f
Compile fix for Release
2014-04-04 15:19:39 +02:00
Aleric Inglewood
1c8876cead
Synchronize looping animations that start at the same moment.
2014-04-04 15:19:28 +02:00
Aleric Inglewood
1bcb6ad20d
Version 2 of AISyncClient et al.
...
A tool to synchronize objects:
Objects derived from AISyncClient can signal that they are
'ready' or 'not ready' for up to 32 events (using a bitmask)
at a time. Clients that are created at roughly the same time
as other clients, and which return the same 'key' (a virtual
function returning an AISyncKey object) will be grouped together
and receive events (by means of virtual functions being called)
to notify them of all clients being ready or not for one of the
events (the least significant bit)). The other events can be polled.
This new version does away with all the templates and explicitly
remembers what events each client is ready for instead of just
updating a counter of the number of clients. This was necessary
because a client is removed then the server needs to know if it
was ready or not when it has to be able to update those counters.
This time I chose to just run over all stored clients and AND
and OR the per-client-ready-masks because 1) that information
is available now and 2) the lists will normally contain only
one or two clients, so it's fast enough.
The new version also allows for real key comparison (and derived
keys) instead of just using "hash" value that is compared.
2014-04-04 15:19:18 +02:00
Aleric Inglewood
66aaa9cf80
Add LLMotionController* LLMotion::mMotionController
...
This is needed for synchronization: motions will have to start
(with a specific start time offset) from a point in the code where
only the motion object is available.
I added/used LLMotionController& in a previous commit, this was
now changed into a pointer. There is (obviously) not much reason
for that, but also no disadvantage: the diff relative to LLs code
doesn't get larger since the references where already added, too.
Conflicts:
indra/llcharacter/llkeyframemotion.cpp
indra/llcharacter/llkeyframemotion.h
2014-04-04 15:19:02 +02:00
Aleric Inglewood
61d365e957
Removed this again...
2014-04-04 15:15:36 +02:00
Aleric Inglewood
006b319c3a
Add AISyncClient<> (and AISyncServer).
...
A tool to synchronize objects:
Objects derived from AISyncClient can signal that they are
'ready' or 'not ready' for up to 4 events (using a bitmask)
at a time. Clients that signal to be ready for anything
at roughly the same time as other clients, and which return
the same 'hash' (a virtual function returning a 64bit value)
will be grouped together and receive events (by means of
virtual functions being called) to notify them of all clients
being ready or not for one of the events (syncevent1).
The other three events can be polled.
The memory usage is low (one pointer per client that points
to its AISyncServer object), servers are released to a cache
after about 100 ms (unless there is actual need for synchronization),
so there aren't much of those either.
The CPU usage is extremely low: all events are handled in
parallel in a 32 bit value (6 bits per event to count the
number of registered clients and the number of ready clients
for each event, and the remaining 8 bits to count the
number of reference pointers (which should only be a constant
higher, so that is overkill). To signal to a server that
a client has become ready or not is mostly a function call,
which then takes 1 clock cycle or so before returning.
Registration of a client is slightly more expensive as it
requires a pointer to be added to the end of a std::list.
This tool could easily be used as part of the graphics engine
(not that I intend to do that :p).
2014-04-04 15:15:26 +02:00
Aleric Inglewood
e38ec797fd
Fix lookat and pointat shared experience.
...
There was a bug that when people turned off sending viewer effects,
they'd also turn off sending LookAt, while there is a seperate
checkbox to turn THAT off, while still seeing their own avatar
happily look around, breaking shared experience (most notably, most
people will be complete oblivious of the fact that they look like
zombies to others and that their friends do not see the same thing
on their screen).
This patch fixes this: both parties now see the same thing. Lookat
and PointAt are only turned off by their respective checkboxes,
and no longer silently influenced by turning off other viewer
effects.
2014-04-04 15:15:15 +02:00
Aleric Inglewood
94b42e7a9b
Speed up of particular inefficient part related to motions.
...
For these standard motions, the viewer likes to very frequently
flood-call startMotion/stopMotion sometimes, which at the very
least needs a LLUUID lookup in a std::map. In particular, this
is done for two of them for every avatar in the sim every frame.
This code makes it possible to test if that makes sense by
merely doing a bit test.
Conflicts:
indra/llcharacter/llkeyframemotion.h
2014-04-04 15:14:54 +02:00
Aleric Inglewood
61097dac72
Auto clean up motion cache.
...
Conflicts:
indra/llcharacter/llkeyframemotion.cpp
indra/llcharacter/llkeyframemotion.h
indra/newview/llfloaterbvhpreview.cpp
2014-04-04 15:10:52 +02:00
Aleric Inglewood
116fe01dee
Add AIDebugInstanceCounter
...
Prints number of instances upon construction and destruction.
Usage:
class LLSomething : public AIDebugInstanceCounter<LLSomething>
...
2014-04-04 14:57:55 +02:00
Aleric Inglewood
ba2bf9f366
Get rid of unused and irrepairable code.
2014-04-04 14:57:41 +02:00
Aleric Inglewood
a5b68f2da2
Changes to llkeyframemotionparam.cpp as result of audit.
...
These changes were the result of my Motion leak audit.
However, there is a serious problem with LLKeyframeMotionParam
in that it stores plain pointers to objects that can and will be deleted
by other objects. Its the classicial LL example of coding
non-Object-Oriented badly maintainable and instable code.
I cannot make sure this won't go wrong for the simple fact
that LLKeyframeMotionParam is not used at ALL in our code.
Hence, the next commit will rather delete this file.
This commit is merely to have a record of this finding.
2014-04-04 14:57:31 +02:00
Inusaito Sayori
97edb0f954
[Floater Flexibility] Part three: Create the flexible toolbar and create the temporary settings for button visibility
...
Look in debug settings for settings that start with ToolbarVisible
This will have an official interface by part four.
2014-04-03 14:36:20 -04:00
Inusaito Sayori
a3531b931b
Feature Request: Ding for groups and conference chats.
2014-04-03 01:27:27 -04:00
Aleric Inglewood
0438f070f7
Merge remote-tracking branch 'singu/master'
2014-04-01 01:28:55 +02:00
Inusaito Sayori
f53e36c430
Fix not being able to buy land because of inversed RLVa logic.
2014-03-31 13:12:33 -04:00
Inusaito Sayori
8889e2de64
Fix icon packaging on mac.
2014-03-31 12:22:12 -04:00
Shyotl
2d0b310e19
Framerate llinfos spew was clobbering cout decimal precision.
2014-03-29 02:19:14 -05:00
Shyotl
dfb465a11b
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2014-03-29 02:13:26 -05:00
Shyotl
9ed2dc755c
Always set materials mask if deferred for materials/alpha pools. Fixes potential crash in LLDrawPoolAlpha::renderAlpha
2014-03-28 17:14:57 -05:00
Latif Khalifa
e70342b356
Removed duplicate check introduced in the last change
2014-03-28 16:42:27 +01:00
Latif Khalifa
ba0fd794d7
Compile fix
2014-03-28 16:20:38 +01:00
Latif Khalifa
dbd7de628f
Fix compilation with gcc
2014-03-28 08:50:02 +01:00
Shyotl
d6fdaa93a4
Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).
2014-03-28 02:34:03 -05:00
Latif Khalifa
80076833d1
Fix compilation with gcc
2014-03-28 08:30:22 +01:00
Latif Khalifa
dc9d3fbf96
Fix build with SDL prior to 1.3.0
2014-03-28 08:29:30 +01:00
Latif Khalifa
e12548ab8c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-03-28 08:45:40 +01:00
Shyotl
894261862d
Tweaks to stencil handling to allow masking out of sky (or geometry).
...
Reset stencil clear value to 0 after done clearing.
2014-03-27 22:31:47 -05:00
Shyotl
07a261a259
A little bit of cleanup.
2014-03-27 22:04:30 -05:00
Shyotl
34a7bf4dbb
Comment out unused shader.
2014-03-27 21:30:23 -05:00
Shyotl
5988f6cf88
Updated rigged mesh face batch/pool handling.
...
Fixed issue with fullbright and glow occlusion.
RenderTransparentWater toggling should work more gracefully.
Fixed some bugs in general drawpool classification for faces. Bump pool was superceding more than it should have.
2014-03-27 21:27:40 -05:00
Inusaito Sayori
039be1f8e9
Fix Issue 1413: Local Texture Default Texture Update Settings, Also fix the side issue of the More section not having visible ui at first.
...
Also I got fed up with the bad code and leaks so I did some refactoring of floaterlocalassetbrowse.*, but just a bit.
2014-03-27 21:33:21 -04:00
Inusaito Sayori
70e92a1cea
More helpful fixes and touchups from Cinder
2014-03-27 20:10:06 -04:00
Inusaito Sayori
2af2e37dcd
Right clicking folder with only gestures (no worn items) should still offer remove from outfit if any gesture in that folder is active.
...
Also follow linked folders when wearing folders, this will make linked folders a lot more useful!
Also fixes a warning and some spacing issues
2014-03-27 20:02:12 -04:00
Inusaito Sayori
a6559b1e51
[Floater Flexibility] Part two: Move floater dictionary into menu commands and use a common function to ShowFloaters between LLToolBar and menus.
2014-03-27 00:31:32 -04:00
Inusaito Sayori
361b8852df
Fix Issue 1419: Moving a link to an inventory folder moves the pointed folder and not the link
2014-03-25 19:56:41 -04:00
Inusaito Sayori
ff201ce3f9
Fix Issue 1448: Hard crash when emptying the mute list.
2014-03-25 19:51:49 -04:00
Inusaito Sayori
de2ce83a8d
Touchups to namesystem update
2014-03-25 19:39:02 -04:00
Inusaito Sayori
f37d83abe1
[Floater Flexibility] Part one: Refactor all floaters to work with the dictionary in one way or another.
2014-03-25 00:23:56 -04:00
Inusaito Sayori
ee610ceb3f
The Name System update!
...
Adds name list specific name settings, Removes boolean for having lists of speakers with legacy names in favor of having a more flexible setting for them
Have a look at the combo boxes on Adv. Chat->Chat UI to customize these new settings.
There is now a fourth option for name display: LegaCy Name (D is play Name)
2014-03-24 17:52:13 -04:00
Inusaito Sayori
5affacab70
Fixes, mainly for Clang/Mac, from Cinder.
2014-03-24 16:56:10 -04:00
Latif Khalifa
924011f36e
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-03-23 14:24:47 +01:00
Inusaito Sayori
70b5a6f05b
Prevent Issue 1445, reassess enablement of asset browser buttons when selection may have changed
2014-03-23 06:03:20 -04:00
Inusaito Sayori
05c7270dcf
Merge changes for STORM-2008
...
"Remove from outfit" should deactivate gestures in a folder as well as take off items
Credit to Lance Corrimal
2014-03-20 03:53:11 -04:00
Inusaito Sayori
a75e34d1c2
Feature Request: Allow "wear_folder" SLapps
2014-03-20 03:34:17 -04:00
Inusaito Sayori
f7139ac20e
Fix Issue 1406: Create Landmark shows name twice, not description
2014-03-18 19:45:18 -04:00
Inusaito Sayori
e43d718e0f
Sappadilli's fix for the mini button
2014-03-18 19:18:57 -04:00
Inusaito Sayori
cc0b5e660d
Touch missed spots for picking rigged mesh
2014-03-18 18:38:30 -04:00
Latif Khalifa
8f525a37da
Typofix
2014-03-17 00:20:32 +01:00
Latif Khalifa
5e62d2b104
Revert to using Vivox SDK 2 on Linux
2014-03-16 22:44:30 +01:00
Damian Zhaoying
6c373ee31e
Update Spanish languages files
2014-03-15 05:14:07 -03:00
Lirusaito
d98c46beb0
Extend SGAllowRiggedMeshSelection to work in inspect and on others
2014-03-13 01:31:11 -04:00
Lirusaito
850772a4ce
[RLVa] About floater version display adjustment
2014-03-12 22:21:55 -04:00
Latif Khalifa
08be65e649
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-03-13 02:04:59 +01:00
Lirusaito
ed8e37ed89
[RLVa] Updates thanks to Kitty
...
1ea7389, 49be412, ed4c8e6 & 7ce9521
- changed : "Give to #RLV" agent-to-agent and script-to-agent offers can contain subfolders
-> limited to 3 levels (e.g. #RLV/~FolderA/FolderB/FolderC)
-> #RLV folder is auto-created if it doesn't currently exist
8780d84 - Incremented version number to RLVa-1.4.10
f078067 - internal : boolean (custom) debug settings should have a boolean type
72a8ad8 & 401ca14 - internal : added supporting code for "Detach Folder" RLVa lock checks
05718b5
- fixed : RenderResolutionDivisor is non-functional
-> RenderResolutionDivisor isn't actually taken into account when checking the new screen resolution against the current screen buffer size
4fa138b
- fixed : viewer clips mouse to its rectangle when switching into mouselook while it's not the active application
-> Repro:
* rez a prim with a script to llForceMouseLook(TRUE) and force-sit when clicked (with a slight delay)
* click the prim and give focus to another application
=> the viewer will center the mouse cursor on itself and restrict movement to within its own rectangle (requires alt-tab to escape)
+ Singu Note: Thanks to Kitty for this, it is possible that this would happen in our last release
14132c9
- fixed : region name and global coordinates are shown on the About floater when @showloc restricted
+ Singu Note: RLV version is now shown in help->about
9a2af62 - changed : llRegionSayTo messages are no longer subject to @recvchat(from) or @recvemote(from)
2dc4b89
- fixed : @getstatus and @getstatusall should specify an (optional) separator
-> added support for both @getstatus:tp;|=123 and @getstatus:;|=123
fbb3fb1 - Incremented API version number to 2.8.0
92c39b9 - internal : quick and dirty hack fix for RlvUtil::filterNames() but there's no time to do a proper backport from RLVa-1.5
2580f1c - internal : remove hack for legacy viewers without multi-attachment support
2014-03-12 19:41:15 -04:00
Latif Khalifa
1732d6d427
[Voice Update] Sync default voice debug level with upstream.
2014-03-12 23:48:07 +01:00
Latif Khalifa
bb9a958a1e
[Voice Update] Update SLVoice prebuilds and packaging script
2014-03-12 22:50:43 +01:00
Latif Khalifa
f1b8c36a28
Merge branch 'VoiceUpdate' of git://github.com/Lirusaito/SingularityViewer
2014-03-12 22:21:43 +01:00
Aleric Inglewood
03ed12a9b1
Merge remote-tracking branch 'singu/master'
2014-03-12 20:36:12 +01:00
Lirusaito
30f5a3a162
Update qtoolalign (Fixes issue 704)
...
- Removes shortcut ctrl-a for align tool
-- to avoid ctrl-a for select all text in UI controls messing up prim selection
- Adds llselectmgr select all function
-- to replace ctrl-a select all prims functionality that was a side effect of qtoolalign having this shortcut
- Adds toggle button (up/down arrow) to build floater for toggling display of the lower tab container area
-- This is to satisfy users who relied on ctrl-a to use align while the build floater was minimized and out of the way
- Syncs qtoolalign from Alchemy
2014-03-09 19:00:52 -04:00
Latif Khalifa
e4a3f76f55
Fixed an artifact of Root->Avatar Center rename (Sappadilli)
2014-03-02 20:05:49 +01:00
Drake Arconis
f5bdb56a7c
Crash fixes in model upload
2014-03-01 18:53:51 -05:00
Drake Arconis
64d4a9e240
Add missing header guards
2014-03-01 18:00:59 -05:00
Drake Arconis
71d9084a95
Clean out old OGPX stuff
2014-03-01 17:34:22 -05:00
Latif Khalifa
9d6092faaa
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-02-21 09:30:08 +01:00
Shyotl
bb0f17ae6f
Fix poor batching with mac/ancient drivers. Also, some minor tweaks to sorting algorithm.
2014-02-21 02:24:42 -06:00
Latif Khalifa
ebb46999d8
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-02-20 10:31:47 +01:00
Shyotl
1c48aa8f97
Added missing can_batch_texture check. Fixes unbatchable faces occasionally getting batched with the last batchable face batch. This was mostly noticeable with animated faces.
2014-02-19 22:35:43 -06:00
Shyotl
bdc0ad2b8f
Experimental volume face batching changes (Cursory testing shows: +~10% larger mean batch size).
...
-Drive pass selection by face pools. Doing such removes a fair bit of redundant (and often buggy) code.
-Ignore irrelivant batch breakers depending on pass/pool type.
-Face sorting algorithm modified to potentially allow larger batches.
-Removed a few unused/broken things (bake_sunlight/no_materials)
-Fullbright handling should hopefully be a little more consistent.
-Prevent fullbright faces from being placed in 'simple' pool. (They are already simple-er)
Fixed attribute error that popped up with bump faces when batching was disabled.
2014-02-18 11:43:50 -06:00
Shyotl
ac8d5e5ab3
Let shaders dictate vertex buffer attributes for alpha faces (if shaders are enabled)
2014-02-18 09:21:31 -06:00
Latif Khalifa
41416dcffe
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-02-11 03:23:21 +01:00
Shyotl
dda7cb5791
Lazy workaround avoiding undefined behavior for rigged meshes with invalid joints.
2014-02-10 20:20:03 -06:00
Shyotl
f7fdeeea9b
Be super sure not to let rigged vert weights extend beyond actual joint count.
2014-02-10 20:18:39 -06:00
Shyotl
9d7d7590a7
Prevent debug visualizations from writing to the z-buffer (caused occlusion weirdness)
2014-02-09 23:40:03 -06:00
Inusaito Sayori
77848afc94
Tiny patch for Issue 1385: Use normal folders for outfits while still creating links for everything
...
Adds debug setting LiruLegacyOutfitAllLinks which overrides legacy outfit settings and forces the resulting folder to consist of only links
2014-02-09 14:42:19 -05:00
Inusaito Sayori
8f7e96e2a5
Minimap enhancements!!
...
Much of this patch comes from upstream and Kitty Barnett, or is inspired from their works
This commit applies the World-Minimap patches from Catznip.
Catznip stuffs:
- Issue 1383: Parcel lines on mini map
- Show parcels on the minimap
- Minimap menu: "Show" submenu: "Property Lines" "Parcels for Sale"
- Option to have world map textures on the minimap
- Minimap menu: "World Map Textures"
- Singular touch: Made this comply with hypergridding.
The minimap will now scroll zoom based on where your mouse is if centering on camera is off.
A lot of cruft was cleaned up in this merge, a lot of gSavedSettings lookups in draw were converted to LLCachedControls, some license updates were performed.
Finally: By myself, but inspired by upstream and requested in the group before:
- Option to show tracking circles around people selected on the radar while the radar is visible
- Minimap menu: "Show" submenu: "Radar Tracking Circles"
2014-02-08 18:26:18 -05:00
Shyotl
eab807daeb
Fix fullbright alpha in fixed-function.
2014-02-08 01:47:22 -06:00
Inusaito Sayori
c4bfdcbeac
Address Issue 1381: Mouse look cross hair coloration
...
Adds debug setting LiruCrosshairColor
2014-02-07 14:59:03 -05:00
Inusaito Sayori
3801949887
Little bit more touching up to the italian XML, this time for overlay bar
2014-02-06 17:27:53 -05:00
Inusaito Sayori
29d5c951c5
[STORM-1981] Change tracking beacons to extend to the ground and (optionally) vertically indicate direction
...
Jonathan Yap's beacon enhancements, with a Singular twist!
2014-02-06 17:23:28 -05:00
Inusaito Sayori
eb4b0d630f
[MAINT-2287] The rest of the updates so far to outbox.
2014-02-06 14:53:13 -05:00
Inusaito Sayori
b6225d1d9a
[MAINT-2287] Handle refactor
2014-02-06 14:51:36 -05:00
Inusaito Sayori
32ec2be0b6
SimFeatures spew demoted to logcontrol debugs.
2014-02-05 21:39:50 -05:00
Inusaito Sayori
d7dfa91f6f
Remove incorrect "You should upgrade your viewer." spew, and demote it to lldebugs.
2014-02-05 20:59:10 -05:00
Inusaito Sayori
c4cc9dd417
Stop leaking in object import!
2014-02-05 15:17:44 -05:00
Inusaito Sayori
884b707385
Hey toolbar, toolbar italiano!
2014-02-04 18:41:10 -05:00
Inusaito Sayori
acbc81c1ea
Further Italian Translation purification, fixup, and touches.
2014-02-04 18:33:02 -05:00
Inusaito Sayori
cc60dcc8a4
Languages preferences in order with actual languages in the right place above, please, thank you?
2014-02-04 16:20:24 -05:00
Inusaito Sayori
275f85e7a6
Fix god chat not showing up in god color if the god is using a display name.
2014-02-04 15:21:13 -05:00
Latif Khalifa
24f99a2920
Merge remote-tracking branch 'lirusaito/master'
2014-02-04 01:40:42 +01:00
Inusaito Sayori
2acfbf12ed
Fix Issue 1368: Camera viewing angle resets after mouselook.
...
Only reset FOV when right click was held or released just before leaving, now.
2014-02-03 17:20:25 -05:00
Inusaito Sayori
b0972de510
Address Issue 1371: Enhancement: in Edit object Positions X & Y for OpenSim VarRegion
2014-02-02 16:53:55 -05:00
Inusaito Sayori
af58636c7c
Fix the Login Panel such that it persists until a successful login and maintains ui values between failed logins
...
When the login panel used to die, it now hides instead, we only truly kill it upon successful login.
Much of the opening and setting behaviors have been cleaned up to ensure fields are autofilled by the viewer without any user action once
Everything else like changing saved logins will still work the same.
2014-02-02 16:45:37 -05:00
Inusaito Sayori
7341ad5e6e
Support the Script Message API
2014-02-02 16:36:05 -05:00
Inusaito Sayori
744e6c63b6
Fix Issue 1237: Last online says 01/01/1970 for group members
...
For real this time!
2014-02-02 16:29:06 -05:00
Inusaito Sayori
31aa30e3d0
Group Feature Request: Option to Copy SLURL for an avatar's profile
...
Added to avatar list menus and instant message drop down menu.
2014-02-02 16:27:20 -05:00
Aleric Inglewood
ebb4489c01
Merge remote-tracking branch 'singu/master'
2014-02-01 22:34:13 +01:00
Inusaito Sayori
31b3ae584e
Feature request: menus on the region estate panel's scroll lists.
2014-01-31 00:52:59 -05:00
Inusaito Sayori
151afe4663
Translations fix ups
2014-01-31 00:52:16 -05:00
Inusaito Sayori
b03f7c1504
[RLVa] Version 1.4.9
...
Thanks to Trinity and, of course, her Kitty!
2014-01-31 00:50:45 -05:00
Inusaito Sayori
bceaee6e41
[RLVa] rlva strings floater!
...
Generalized toggle() visible() call pattern of rlv floaters to a template struct.
2014-01-31 00:47:19 -05:00
Latif Khalifa
2a812e0e81
Revert "Limit avatar physics to 20-40 simulation steps per second to avoid wonky integration"
...
This reverts commit cde5b23353 .
2014-01-28 23:59:05 +01:00
Shyotl
58b7fe5fef
Avoid potential buffer over-read in shader, overrun in application.
2014-01-28 16:28:03 -06:00
Latif Khalifa
c4a82fe0d1
Version 1.8.5
2014-01-28 18:12:23 +01:00
Inusaito Sayori
0c33c0de2e
[RLVa] rlva_strings update.
...
rlva strings floater coming soon!
I highly doubt the translations work anymore
If they still can be translated, I leave it up to translators to decide if they should be
Contact me if you need translation code improved here.
2014-01-28 04:41:16 -05:00
Inusaito Sayori
1b32c79a5e
[RLVa] Miscellaneous other touches to rlva code
2014-01-28 04:38:05 -05:00
Inusaito Sayori
dd35f1bd68
[RLVa] Missed sections of canStand update in that last commit.
2014-01-28 04:35:43 -05:00
Inusaito Sayori
9c0d8bbeb1
[RLVa] "blocked_wireframe"? Seems half baked, but it compiles.
2014-01-28 04:34:12 -05:00
Inusaito Sayori
02753bfc7d
[RLVa] gRlvHandler.canStand --> RlvActions::canStand
2014-01-28 04:31:34 -05:00
Inusaito Sayori
88ae36f4e1
[RLVa] Forced TPRequest response is now supported!
2014-01-28 04:27:38 -05:00
Inusaito Sayori
4dcf8f3f45
[RLVa] Removal of z offset restrictions
2014-01-28 03:16:35 -05:00
Inusaito Sayori
9e82297303
[RLVa] rlvfloaterbehaviour.* -> rlvfloaters.*
2014-01-28 00:31:40 -05:00
Inusaito Sayori
14a885f8d0
[RLVa] Modernizations
...
License updates, comment updates, settings cleanup, macros cleanup, dead code removal, etc.
2014-01-27 23:43:16 -05:00
Inusaito Sayori
94aee52c64
[RLVa] b15fdd026026 ported
...
- internal : reviewed @recvim and @sendim for CHUI (SL-3.5)
Singu changes:
- Updated busy to be referred to as do_not_disturb in llviewermessage.cpp
- Don't send autoresponse if we can't send an IM by rlva
- Updated checks for from name being system to be to_id and from_id null checks.
- Minor compile fix in rlvui.cpp for last commit.
2014-01-27 23:42:09 -05:00
Inusaito Sayori
755d3be89b
[RLVa] Disallow inventory floaters when inventory restricted.
...
Formatting eases the diff with rlva upstream
2014-01-27 20:14:02 -05:00
Inusaito Sayori
6a3ee5fac4
[RLVa] f9f8dbe23ec3 ported
...
- internal : reviewed @startim for CHUI (SL-3.5)
-> fixed : "Start Conference Chat" on a selection of multiple calling cards opens an IM session
-> fixed : actions that would result in an IM window opening shouldn't be blocked if the session is already open
-> added : RlvActions class to mimick LLAvatarActions and lowering the rlvhandler.h include dependency
2014-01-27 13:54:13 -05:00
Latif Khalifa
63ff4e281b
Revert "focusFirstItem was no longer being overridden here, this function has proven not needed, thus."
...
This reverts commit 655081365f .
2014-01-25 22:31:08 +01:00
Inusaito Sayori
d1cfe54bd9
Fix Issue 1344: Weird mesh distorted bug
...
Animations require consistent names for points like Avatar Center between viewers
To fix this, we now use Avatar Center instead of Root at the lower levels,
but this is okay, we translate Avatar Center into Root at UI level!
2014-01-25 22:07:39 +01:00
Latif Khalifa
838266d710
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-01-25 21:22:49 +01:00
Aleric Inglewood
6547452136
Merge remote-tracking branch 'singu/master'
2014-01-25 20:29:46 +01:00
Aleric Inglewood
095f2d2255
Allow users to join a new grid with Singularity without first having to install another viewer.
...
I've seen this in other grids (InWorldz and OpenGrid) and is a problem
on DreamNation with every new user: they can't put on a shape or skin
until they first logged in with another viewer. See comments in code.
Tested, and now could successfully add shape, skin, eyes and hair.
2014-01-25 20:20:52 +01:00
Inusaito Sayori
42bf70849c
Fix Issue 1344: Weird mesh distorted bug
...
Animations require consistent names for points like Avatar Center between viewers
To fix this, we now use Avatar Center instead of Root at the lower levels,
but this is okay, we translate Avatar Center into Root at UI level!
2014-01-25 09:44:42 -05:00
Inusaito Sayori
236fa2a284
Fix Issue 870: Crouch toggle not reset when pressing "Fly" button, causes avatar to run/fly downhill.
...
Reimplements crouch toggle such that crouch is now tracked by the agent object
Fixes crouch being reset when restoring focus to the viewer window, as well.
2014-01-24 22:57:19 -05:00
Inusaito Sayori
2450b435a7
Combine commonly created scroll list menus into single menus identified by menu_num instead of their menu_file
...
sScrollListMenus is an array such that it will hold more menus in the future, such as groups.
fmenu_file still exists and will still exhibit its old behavior if used.
2014-01-24 21:41:56 -05:00
Latif Khalifa
aaf06fa2cc
FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware skinning enabled and ALM disabled.
...
NOTE: There appears to be a driver bug on some AMD systems that will cause hardware skinning to break given different combinations of shaders. Users should be advised that if they see improper skinning on their avatars, they should either enable advanced lighting model, or disable atmospheric shaders or hardware skinning.
davep
2014-01-24 12:26:43 +01:00
Latif Khalifa
de29ea779a
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-01-24 12:24:14 +01:00
Inusaito Sayori
282df98d09
Complete resize-friendly appearance mode UI
2014-01-24 01:29:38 -05:00
Latif Khalifa
cc9f6b7b7b
Fitted mesh fixup: change in llvoavatar.cpp enabled extra information
...
for avatar look at targets which is not something users expect, disabling for now
2014-01-24 05:51:26 +01:00
Inusaito Sayori
e3c91a3ba1
Added lsl functions from Second Life RC LeTigre 13.12.20.285035
2014-01-23 21:19:40 -05:00
Latif Khalifa
8ea156d128
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-01-24 02:20:37 +01:00
Latif Khalifa
99db9edfef
Fitted mesh: hookup debug display to Advanced -> Charachter -> Show Avatar Joins
2014-01-24 02:20:25 +01:00
Shyotl
a0c7b1f8ac
Try manually nulling out vbo data if its entire contents are to be overwritten. Rumored intel/nvidia optimization.
2014-01-23 19:06:52 -06:00
Shyotl
97d57d81b0
Skip particle-glow vbo logic if shaders aren't enabled.
2014-01-23 19:02:43 -06:00
Shyotl
66ebe45b5e
Give 'gDeferredNonIndexedDiffuseAlphaMaskProgram' a unique 'name'
2014-01-23 19:01:49 -06:00
Shyotl
7516871b16
Avoid wasting particles on incredibly small/zero length ribbon segments.
2014-01-23 19:00:30 -06:00
Inusaito Sayori
30bd505eab
French update touchup, by Nomade Zhao.
2014-01-23 19:58:45 -05:00
Inusaito Sayori
17f7967e39
Issue 97: Disable Leaving Mouselook when viewer window loses focus
2014-01-23 19:39:38 -05:00
Inusaito Sayori
ab55c61dc3
Feature Request: Add option to reset angles/offsets adjustments made to current camera preset.
...
Adds "Reset Camera Preset Angle to Default" to view menu
Wasn't quite sure where to hook this up, menu seemed the best for the moment, but really it's more of a preferences button function.
2014-01-23 19:35:17 -05:00
Latif Khalifa
066d0221b8
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-01-24 01:16:32 +01:00
Latif Khalifa
269deb56e6
Fitted mesh
2014-01-24 01:11:27 +01:00
Lirusaito
7572674fdb
Enforce xml follows flags in scroll containers, and allow the appearance floater to resize, enforcing minimum dimensions of its default size
...
It was requested to let people resize the height to easily display more sections, and well, this is the easiest fix, if width changes in a nasty way, it can just be fixed since default is min.
2014-01-23 19:07:53 -05:00
Lirusaito
63379105b5
Fix the local chat focu bug, yay!
2014-01-23 19:06:33 -05:00
Lirusaito
655081365f
focusFirstItem was no longer being overridden here, this function has proven not needed, thus.
2014-01-23 17:42:08 -05:00
Lirusaito
7ac0330e4b
Fix a rare glitch where mouselook zoomed field of view would be maintained upon leaving mouselook
2014-01-22 00:57:15 -05:00
Latif Khalifa
bbb1d15b8e
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2014-01-16 08:18:04 +01:00
Latif Khalifa
b7c54301fb
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2014-01-16 08:17:54 +01:00
Inusaito Sayori
75109e14c3
Italics hotfix
...
Restores use of the old slant_amt offset for italicizing fonts by slanting quads.
Note that this is the wrong way to fix the issue and should eventually be removed.
2014-01-15 20:15:53 -05:00
Latif Khalifa
3446f708ff
Syncronized max bandwith const with prefs panel max
2014-01-06 20:27:17 +01:00
Aleric Inglewood
9bce3b38d4
Do not erase cache every login forever, when NewCacheLocation is set a non-existing directory!
...
I can't believe that I have not have gotten a cache for two years
because of this... I knew I didn't, but didn't really want to fix
it while I working on the network code (AICurl) ;). It kinda made
for a good testing. Bet my ISP is glad I fixed it though.
2013-12-31 23:37:10 +01:00
Aleric Inglewood
93736308c9
Add missing ft2build.h to linux64 freetype package.
2013-12-30 19:38:41 +01:00
Aleric Inglewood
ba9c5c366b
Avoid duplicated entries in mAttachedObjectsVector
...
This fixes Top Crasher signatures 2 and 50.
http://crash.singularityviewer.org/crashes.php?signature_id=2
http://crash.singularityviewer.org/crashes.php?signature_id=50
2013-12-30 03:24:46 +01:00
Aleric Inglewood
e523aadc4a
Do not destruct running Responders upon viewer exit.
...
This hopefully saves some crashes.
2013-12-29 21:50:10 +01:00
Aleric Inglewood
4416dafe73
Erata for last commit (issue 1113).
2013-12-29 01:49:33 +01:00
Aleric Inglewood
2062431f23
Bug fix.
...
singularity-do-not-run-directly: /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llcommon/llmemory.h:219: void ll_memcpy_nonaliased_aligned_16(char*, const char*, size_t): Assertion `src != __null' failed.
Program received signal SIGABRT, Aborted.
[Switching to Thread 0x7fff3342f700 (LWP 18001)]
0x00007ffff0f951d5 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0 0x00007ffff0f951d5 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
#1 0x00007ffff0f98388 in __GI_abort () at abort.c:90
#2 0x00007ffff0f8e252 in __assert_fail_base (fmt=0x7ffff10cc080 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x2c7ca97 "src != __null",
file=file@entry=0x2c7ca40 "/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llcommon/llmemory.h", line=line@entry=219,
function=function@entry=0x2c7dc60 "void ll_memcpy_nonaliased_aligned_16(char*, const char*, size_t)") at assert.c:92
#3 0x00007ffff0f8e302 in __GI___assert_fail (assertion=0x2c7ca97 "src != __null", file=0x2c7ca40 "/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llcommon/llmemory.h",
line=219, function=0x2c7dc60 "void ll_memcpy_nonaliased_aligned_16(char*, const char*, size_t)") at assert.c:101
#4 0x0000000001b3ebd9 in ll_memcpy_nonaliased_aligned_16 (dst=0x7fff2c39f440 "\001", src=0x0, bytes=0)
at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llcommon/llmemory.h:219
#5 0x0000000001e09d93 in LLVector4a::memcpyNonAliased16 (dst=0x7fff2c39f440, src=0x0, bytes=0)
at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llmath/llvector4a.cpp:44
#6 0x0000000001e2a13c in LLVolumeFace::pushVertex (this=0x7fff3342daf0, pos=..., norm=..., tc=...)
at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llmath/llvolume.cpp:6106
#7 0x0000000001e2a03f in LLVolumeFace::pushVertex (this=0x7fff3342daf0, cv=...) at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llmath/llvolume.cpp:6080
#8 0x0000000001e20498 in LLVolumeFace::optimize (this=0x7fff2c39ee20, angle_cutoff=2) at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llmath/llvolume.cpp:4841
#9 0x0000000001aa61d4 in LLModel::optimizeVolumeFaces (this=0x7fff2c39e100) at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llprimitive/llmodel.cpp:866
#10 0x0000000001aa5f28 in LLModel::createVolumeFacesFromDomMesh (this=0x7fff2c39e100, mesh=0x7fff2c36cc90)
at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llprimitive/llmodel.cpp:829
#11 0x0000000001aa8324 in LLModel::loadModelFromDomMesh (mesh=0x7fff2c36cc90) at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llprimitive/llmodel.cpp:1402
#12 0x0000000000a9bc11 in LLModelLoader::doLoadModel (this=0x7fff4f74d480) at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/newview/llfloatermodelpreview.cpp:1535
#13 0x0000000000a9b100 in LLModelLoader::run (this=0x7fff4f74d480) at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/newview/llfloatermodelpreview.cpp:1395
#14 0x00007ffff5e52e9a in LLThread::staticRun (apr_threadp=0x7ffff7e572e0, datap=0x7fff4f74d480)
at /opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/llcommon/llthread.cpp:93
#15 0x00007ffff7bc6e0e in start_thread (arg=0x7fff3342f700) at pthread_create.c:311
#16 0x00007ffff10490fd in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:113
This happened while loading some .dae.
2013-12-28 20:52:11 +01:00
Aleric Inglewood
a4b2ecc4f7
Fix issue 1113, "detaching editted attachment does not unfreeze avatar"
...
Detaching an attachment didn't reset the select managers pause request
for the avatar.
2013-12-28 18:59:20 +01:00
Aleric Inglewood
c8017c7945
Merge remote-tracking branch 'singu/master'
2013-12-27 17:59:00 +01:00
Aleric Inglewood
f81f5e2374
Show the part of an animation after the loop out point when previewing.
2013-12-27 17:57:45 +01:00
Aleric Inglewood
19a36a6e12
Don't assert at exit.
...
It's perfectly ok when a responder is being deleted before it finished,
when the application is exiting.
2013-12-27 17:55:49 +01:00
Latif Khalifa
9768b3e42f
Build fix
2013-12-25 18:53:29 +01:00
Latif Khalifa
bc6348bb34
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-12-25 18:08:42 +01:00
Shyotl
3da9fe0e94
Avoid calling a few deprecated gl functions when shaders are enabled.
2013-12-25 02:09:36 -06:00
Shyotl
75f94d346d
Fixed Alerics favorite assertion.
2013-12-24 20:21:55 -06:00
Shyotl
4eb9dc5191
Use GL_STREAM_DRAW_ARB for post-process fullscreen quad.
2013-12-24 20:17:05 -06:00
Shyotl
e00e704cbd
Fix minor error in shader which prevented ssao from working with shadows enabled.
2013-12-24 20:16:05 -06:00
Shyotl
033880c8f9
Kill some vertex attribute / shader attribute inconsistencies. (Issue 1287, 1281) Also hopefully improved face edit overlay behavior when editing normal/specular texture/scale/offset/rotation.
2013-12-24 20:15:29 -06:00
Aleric Inglewood
1f80dac4c0
Don't cause undefined behavior by calling std::vector<>::front() for empty container.
2013-12-24 20:03:27 +01:00
Aleric Inglewood
a17eca6300
Merge remote-tracking branch 'singu/master'
2013-12-23 20:34:11 +01:00
Latif Khalifa
4a2168cf48
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-12-20 04:59:59 +01:00
Latif Khalifa
facd5a76c5
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-12-20 04:59:48 +01:00
Latif Khalifa
85c875e856
Link boost dynamically, bundle its libs. Addresses issue 1152.
...
Rebuild collada to also use dynamic boost.
SV-1152 #close Fixed by linking boost dynamically
2013-12-20 03:02:17 +01:00
Aleric Inglewood
302bebd80f
Merge remote-tracking branch 'singu/master'
2013-12-19 23:03:22 +01:00
Inusaito Sayori
85943b8a03
Rename zmm_mlfov to ExodusAlternativeFOV
2013-12-19 11:57:58 -05:00
Aleric Inglewood
8f2781ca3b
Fix bug with adding a new grid.
2013-12-19 03:13:33 +01:00
Inusaito Sayori
101c65098d
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-12-17 00:28:20 -05:00
Inusaito Sayori
195c962d8c
Feature request from Issue 1285: Cost per sq. m. display on map.
2013-12-15 09:51:16 -05:00
Siana Gearz
2bb2e05ef9
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2013-12-15 14:56:20 +01:00
Siana Gearz
679019f2de
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-12-15 14:09:29 +01:00
Inusaito Sayori
649c29674c
Feature Request: User control over which UI will become hidden when going into mouselook.
...
Adds three checkboxes to input and camera preferences: Floaters, Notices, and Menubar
Should satisfy Issue 462.
SV-462 #close Done~
2013-12-14 20:48:48 -05:00
Inusaito Sayori
b22cc2c2fa
[Warnings] Fixed warning: "_FORTIFY_SOURCE" redefined [enabled by default]
2013-12-14 00:05:10 -05:00
Inusaito Sayori
2642a1c3ff
[Warnings] Fix class/struct inconsistency.
2013-12-14 00:00:52 -05:00
Shyotl
9014d56957
Fix 'setBuffer: Shader consumption mismatches data provision.' error in LLPipeline::updateCull. Issue caused by LLDrawPoolAlpha not unbinding shaders when only basic shaders are enabled. https://code.google.com/p/singularity-viewer/issues/detail?id=1281
2013-12-13 02:21:54 -06:00
Shyotl
7da8b012e6
Pulled SSAO out into its own shader to support running at a lower-than-native framebuffer resolution (defaults at half-resolution [SHRenderSSAOResolutionScale=.5] ). This doesn't improve the slow ssao/shadow softening, however, as that bit remains unchanged.
2013-12-13 02:19:57 -06:00
Inusaito Sayori
edabdcf724
log_sStringTemplates_accesses now spews lldebugs, not llinfos
2013-12-11 15:57:05 -05:00
Siana Gearz
c5adb01ed9
Stop occasional crash during shutdown
2013-12-10 23:11:07 +01:00
Inusaito Sayori
13f26e6b5a
Feature request: Add EnableNongestureSounds as an opposite to gesture mute
2013-12-10 15:56:07 -05:00
Siana Gearz
64e7be0321
This should make the cache-full situation a lot more benign
...
I should be ashamed of myself, i took ugly, terrible code and uglied it up even more.
2013-12-09 08:35:21 +01:00
Siana Gearz
e182173ee2
Fatal paranoia cure
2013-12-09 03:39:47 +01:00
Inusaito Sayori
a59940c592
Fix Issue 1273: Typing in Group Chat opens IM Window for other participants
...
Broken logic, my bad.
2013-12-08 14:21:39 -05:00
Inusaito Sayori
36d8df602c
[Radar] Feature request: Have Focus Next/Prev wrap around when it reaches the end
2013-12-06 13:10:12 -05:00
Inusaito Sayori
062973aaaf
Default SinguOffsetScrollKeys to false and expose it in Camera prefs.
...
Adds "Scrolling with control and/or shift held adjusts camera position" to Input & Camera prefs
2013-12-06 08:43:28 -05:00
Inusaito Sayori
be369b5500
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-12-04 14:05:46 -05:00
Aleric Inglewood
ed0628774a
Turn noisy AudioEngine debug output into Debug Level.
2013-12-04 01:21:18 +01:00
Inusaito Sayori
f988cd36b6
Attempt to fix Issue 1264: Vacant lines in Friends list
2013-12-02 22:45:44 -05:00
Inusaito Sayori
8fb2812899
LLIconCtrl Params
2013-12-02 20:45:07 -05:00
Inusaito Sayori
b4d0896507
Fixups to mistakes of the past.
2013-12-02 20:30:59 -05:00
Inusaito Sayori
4116ac75f6
LLUICtrl Params
...
Also adds support for requests_front boolean attribute to lluictrl from upstream
2013-12-02 20:17:48 -05:00
Inusaito Sayori
23958965aa
LLInitParam/LLUI Params enhancement
...
Specialized param handling for common linden types
And pre-viewer-interesting modernized llinitparam.* (includes llsdparam.cpp update)
2013-12-02 00:27:50 -05:00
Inusaito Sayori
9723a45e72
Modernize LLIconCtrl
...
Adds min_height and min_width attributes
Adds mPriority for controlling priority with which to call LLUI::getUIImage*
Moves specialized setImage()s into setValue
Removes mImageName and mImageID, value is stored in base as LLSD now
2013-12-01 15:58:24 -05:00
Inusaito Sayori
bbb55b0b4d
LLUICtrl support for "enabled_control" and "disabled_control" attributes from upstream.
2013-12-01 11:56:45 -05:00
Inusaito Sayori
f3ca4b6e34
Fix Issue 1222 by changing the default Field of View for mouselook zoom
...
Smooth scroll changes the meaning of the numbers, unfortunately.. so for those who haven't figured out how to customize their mouselook zoom, this'll hafta do.
Also clarified the description of the debug.
SV-1222 #close Fixed up, will require a reset of the debug setting "zmm_mlfov", clean install, or just scroll to modify it.
2013-12-01 00:33:04 -05:00
Aleric Inglewood
1dfd9a9c75
Merge remote-tracking branch 'singu/master'
2013-11-30 18:44:58 +01:00
Latif Khalifa
340286f918
Merge branch 'master' of https://github.com/siana/SingularityViewer
2013-11-29 16:24:36 +01:00
Latif Khalifa
e41b346046
Added CrashReportID debug setting that will be set to the ID of the last crash that was sent to the crash tracker
2013-11-29 16:22:06 +01:00
Latif Khalifa
d8fa14cac5
Notifying users about crash report ID on login creates confusion.
...
Revert "Added notification that chat report has been sent after the user logs in."
This reverts commit 4e79bce3e2 .
2013-11-29 16:09:58 +01:00
Latif Khalifa
2c99e07b93
Fallback to old method of bundling MS C runtime, if automatic one fails
2013-11-29 16:06:56 +01:00
Latif Khalifa
f1ee3a0834
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-11-29 15:33:54 +01:00
Siana Gearz
ff3f6eccf7
One handed walking and running - LMB+RMB on your avatar
2013-11-29 11:33:59 +01:00
Siana Gearz
b7e9a94744
Fix closing the pay floater, reported in chat by Margot
2013-11-29 10:05:17 +01:00
Siana Gearz
faf5a8e694
Translation and debranding fixes
2013-11-29 08:47:25 +01:00
Siana Gearz
8a13599436
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-11-29 06:27:05 +01:00
Siana Gearz
767597ffe3
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer
2013-11-29 06:25:10 +01:00
Siana Gearz
919fdafad5
Language properties clean-up
2013-11-29 06:24:55 +01:00
Shyotl
78e3d61b98
Remove ambient occlusion darkening from all deferred shaders except the one that actually calculates occlusion values.. (aka every shader except class2/softenLightF.glsl)
2013-11-28 21:07:25 -06:00
Inusaito Sayori
fd21afa0b3
French ALM words
2013-11-28 20:47:51 -05:00
Inusaito Sayori
5491ff8a51
[LLIMMgr/LLIMPanel] Fix Issue 1254: bug voice in conference
...
Conference ids are subject to change, switched to boost::ref to bind the real one.
SV-1247 #close Fixed nao~
2013-11-28 20:18:29 -05:00
Inusaito Sayori
909ce355e2
[LLIMMgr/LLIMPanel] Switched from dialog checks for nothing special to generic P2P session checking
2013-11-28 20:08:57 -05:00
Inusaito Sayori
63a9555d17
Use Links.SingularityViewer for Issue Tracker link.
2013-11-27 12:27:03 -05:00
Aleric Inglewood
e85241d9ab
Merge remote-tracking branch 'singu/master'
2013-11-26 22:15:00 +01:00
Aleric Inglewood
38957ff531
Reduce calls to LLHoverView::updateText
...
Basically to avoid calling LLTrans::getString 250 times per second,
and seeing
INFO: log_sStringTemplates_accesses: LLTrans::getString/findString called 19000 in total.
INFO: log_sStringTemplates_accesses: LLTrans::getString/findString called 20000 in total.
etc, every 40 seconds in the log.
2013-11-26 22:09:46 +01:00
Aleric Inglewood
8357a2b90b
Speed up ll_assert_aligned
...
Although only used in Debug mode, this showed up in a profiling
with a very significant amount of CPU cycles (in a state when
the viewer bogged down to 1 FPS because of drawing terrain,
but still - significant compared to the code that was being
executed (ie, 10%)).
This patch should bring that down from a few hunderd to one clock
cycle.
2013-11-26 17:52:24 +01:00
Salvatore La Bua
dad7228d56
Add Italian skin translation provided by druskus
2013-11-26 11:20:18 +01:00
Latif Khalifa
e2c8e4950d
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-11-26 11:15:48 +01:00
Inusaito Sayori
342c812121
Add initial_mime_type param to LLFloaterWebContent, defaulted to "text/html"
2013-11-26 05:13:02 -05:00
Inusaito Sayori
4c1880acac
Default legacy log launch to on, and limit it to platforms it works on(windows) at compile time.
2013-11-26 04:49:37 -05:00
Inusaito Sayori
7383b0a974
Sync mats translation, thanks Nomade.
2013-11-26 04:35:00 -05:00
Inusaito Sayori
748d55ddd0
French Materials! (and cleanup\inclusion of old stuff)
2013-11-26 01:19:48 -05:00
Inusaito Sayori
7fd61c3bf1
Fix delete not working in text editors
2013-11-25 21:03:36 -05:00
Latif Khalifa
48850b2af0
Compile fix.
...
This appears to be committed blindly without testing even if it build.
ll_sd_from_color4() / ll_color4_from_sd() need to be used to store and get color from LLSD.
2013-11-26 01:03:10 +01:00
Latif Khalifa
4e79bce3e2
Added notification that chat report has been sent after the user logs in.
...
This will also add a line in the chat log with the report id
2013-11-26 00:38:00 +01:00
Latif Khalifa
362415fe8a
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-11-26 00:36:53 +01:00
Latif Khalifa
38248ac5b3
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-11-26 00:36:43 +01:00
Inusaito Sayori
98d5e4bea8
Possibly fix and restore Report Abuse to avs list menus
2013-11-25 03:44:07 -05:00
Inusaito Sayori
201ca35afb
Possible fix for Mute/Unmute from lists of avatars not working
2013-11-25 03:33:13 -05:00
Inusaito Sayori
26655aefe0
Fix last online unknown showing up as zeroed out date.
...
Adds group_member_status_unknown to strings.xml
SV-1237 #close Fixed~
2013-11-25 03:24:40 -05:00
Aleric Inglewood
f8d9bcf487
Don't reset easy handles after using them.
...
We create a new easy handle every time.
2013-11-24 19:15:48 +01:00
Aleric Inglewood
ec436b0e3b
Improve upload_finished detection for HTTP requests.
...
We detect the end of an upload when libcurl informs us
that it is no longer interested in knowing if a socket
is writable (which it tells us cause we're doing the call
to select(), by means of a call to MultiHandle::socket_callback).
However, this does not *always* work.
The debug output might look like this:
[...initialization and first part of a TLS handshake...]
0x7f759f0ad700 CURL : select(55, {17, 39, 46, 47, 48, 49, 50, 51, 52, 54}, NULL, NULL, timeout = 1 ms) = 7
0x7f759f0ad700 CURLTR : curl_multi_socket_action((CURLM*)0x7f758c002920, 46, CURL_CSELECT_IN, <unfinished> <--- Calling curl_multi_socket_action (socket 46 is readable)
0x7f759f0ad700 CURLIO 0x13fce7b0 * SSLv3, TLS change cipher, Client hello (1):
0x7f759f0ad700 CURLIO 0x13fce7b0 S> 1 bytes
0x7f759f0ad700 CURLIO 0x13fce7b0 * SSLv3, TLS handshake, Finished (20):
0x7f759f0ad700 CURLIO 0x13fce7b0 S> 16 bytes
0x7f759f0ad700 CURLIO 0x13fce7b0 * SSL connection using AES256-SHA
0x7f759f0ad700 CURLIO 0x13fce7b0 * Server certificate:
0x7f759f0ad700 CURLIO 0x13fce7b0 * subject: C=US; ST=California; L=San Francisco; O=Linden Lab, Inc.; CN=*.agni.lindenlab.com; emailAddress=root@lindenlab.com
0x7f759f0ad700 CURLIO 0x13fce7b0 * start date: 2012-09-20 22:55:47 GMT
0x7f759f0ad700 CURLIO 0x13fce7b0 * expire date: 2015-09-20 22:55:47 GMT
0x7f759f0ad700 CURLIO 0x13fce7b0 * issuer: C=US; ST=California; L=San Francisco; O=Linden Lab, Inc.; OU=Linden Lab Certificate Authority; CN=Linden Lab Certificate Authority; emailAddress=ca@lindenlab.com
0x7f759f0ad700 CURLIO 0x13fce7b0 * SSL certificate verify ok.
0x7f759f0ad700 CURLIO 0x13fce7b0 * STATE: PROTOCONNECT => DO handle 0x7f758d62d810; (connection #2 )
0x7f759f0ad700 CURLIO 0x13fce7b0 H< POST /cap/d67d4540-4504-b3d1-1d26-112010e88bd8 HTTP/1.1\r\nHost: sim10480.agni.lindenlab.com:12043\r\nAccept: */*\r\nAccept-Encoding: deflate, gzip\r\nContent-Type: application/llsd+xml\r\nX-SecondLife-UDP-Listen-Port: 32837\r\nConnection: keep-alive\r\nKeep-alive: 300\r\nContent-Length: 333\r\n\r\n
0x7f759f0ad700 CURLIO 0x13fce7b0 * STATE: DO => DO_DONE handle 0x7f758d62d810; (connection #2 )
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 0) <=== THIS IS NEW: total to upload: 333 bytes, total uploaded: 0 bytes.
0x7f759f0ad700 CURLIO 0x13fce7b0 * STATE: DO_DONE => WAITPERFORM handle 0x7f758d62d810; (connection #2 )
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 0)
0x7f759f0ad700 CURLIO 0x13fce7b0 * STATE: WAITPERFORM => PERFORM handle 0x7f758d62d810; (connection #2 )
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 0)
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 0)
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 0)
0x7f759f0ad700 CURLTR : curl_easy_getinfo((CURL*)0x13fcf320, CURLINFO_PRIVATE, 0x7f759f0abdb0) = CURLE_OK
0x7f759f0ad700 CURL : Entering MultiHandle::socket_callback((CURL*)0x13fcf320, 46, CURL_POLL_INOUT, 0x7f758c001508, 0x7f758c2ce4e0) [CURLINFO_PRIVATE = 0x13fce7b0]
0x7f759f0ad700 CURL : CurlSocketInfo::set_action(CURL_POLL_IN --> CURL_POLL_INOUT) [0x13fce7b0] <=== WATING FOR WRITING BUT ALREADY WAITING FOR INPUT!
0x7f759f0ad700 CURL 0x13fce7b0 reset_lowspeed: mLowSpeedClock = 138530973390; mStalled = -1
0x7f759f0ad700 CURLTR : <continued> {11}) = 0 <--- Returning from curl_multi_socket_action
0x7f759f0ad700 CURL : select(58, {17, 39, 46, 47, 48, 49, 50, 51, 52, 54}, {36, 46, 57}, NULL, timeout = 756 ms) = 5
0x7f759f0ad700 CURLTR : curl_multi_socket_action((CURLM*)0x7f758c002920, 46, CURL_CSELECT_OUT, <unfinished> <=== SOCKET AVAILABLE FOR WRITING
0x7f759f0ad700 CURLIO 0x13fce7b0 * additional stuff not fine transfer.c:1037: 0 0
0x7f759f0ad700 CURLIO 0x13fce7b0 D< 333 bytes: "<llsd><map><key>folders</key><array><map><key>fetch_folders</key>...etc" <=== WRITING *ALL* DATA
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 333) <=== THIS IS NEW, DETECT END OF UPLOAD
0x7f759f0ad700 CURL 0x13fce7b0 upload_finished: mStalled set to Time_10ms (138530973390) + 6000 (60 seconds)
0x7f759f0ad700 CURL : Entering BufferedCurlEasyRequest::curlProgressCallback(0x13fce7b0, 0, 0, 333, 333)
0x7f759f0ad700 CURL : select(58, {17, 39, 46, 47, 50, 52, 54}, {36, 46, 57}, NULL, timeout = 0 ms) = 8
0x7f759f0ad700 CURLTR : curl_multi_socket_action((CURLM*)0x7f758c002920, 46, CURL_CSELECT_IN|CURL_CSELECT_OUT, <unfinished>
0x7f759f0ad700 CURLIO 0x13fce7b0 * HTTP 1.1 or later with persistent connection, pipelining supported
0x7f759f0ad700 CURLIO 0x13fce7b0 H> HTTP/1.1 200 OK\r\n
...and the server already replies without a call to MultiHandle::socket_callback between
writing and reading, because the socket was still (already) waiting for input anyway
(since it was waiting for the SSL/TLS handshake before in this case, but
it also happens when the data has to be written in more than one writes).
Using the progress callback however, we are able to detect the end of the upload right
after writing, anyway.
2013-11-24 19:13:17 +01:00
Aleric Inglewood
6714d3585d
Improve CURLTR debug output.
...
It was very confusing that only *after* a call to a libcurl function
it was written to debug output that it was called.
Now it prints it before calling it, and when that leads to additional
debug output while inside the function, it prints that before giving
the return value.
For example:
0x7f529ea15700 CURLTR : curl_multi_socket_action((CURLM*)0x7f528c002920, CURL_SOCKET_TIMEOUT, 0, <unfinished>
0x7f529ea15700 CURLIO 0xea8ef30 * About to connect() to login.agni.lindenlab.com port 443 (#0 )
0x7f529ea15700 CURLIO 0xea8ef30 * Trying 216.82.16.97...
0x7f529ea15700 CURLIO 0xea8ef30 * 0xe3240e0 is at send pipe head!
0x7f529ea15700 CURLIO 0xea8ef30 * STATE: CONNECT => WAITCONNECT handle 0x7f528c001df0; (connection #0 )
0x7f529ea15700 CURLTR : curl_easy_getinfo((CURL*)0xe3240e0, CURLINFO_PRIVATE, 0x7f529ea13db0) = CURLE_OK
0x7f529ea15700 CURL : Entering MultiHandle::socket_callback((CURL*)0xe3240e0, 36, CURL_POLL_OUT, 0x7f528c001508, 0) [CURLINFO_PRIVATE = 0xea8ef30]
0x7f529ea15700 CURLTR : curl_easy_getinfo((CURL*)0xe3240e0, CURLINFO_PRIVATE, 0x7f529ea13d58) = CURLE_OK
0x7f529ea15700 CURLTR : curl_multi_assign((CURLM*)0x7f528c002920, 36, 0x7f528c031680) = 0
0x7f529ea15700 CURL : CurlSocketInfo::set_action(CURL_POLL_NONE --> CURL_POLL_OUT) [0xea8ef30]
0x7f529ea15700 CURL : MultiHandle::timer_callback(): timeout set to 1 ms.
0x7f529ea15700 CURLTR : <continued> {1}) = 0
Unfortunately, this breaks defining DEBUG_CURLIO without using libcwd,
but that was unusable already anyway (even though it compiled).
2013-11-24 18:24:09 +01:00
Inusaito Sayori
44d1b4f1fb
A start on the group's feature request to have indication of mute in friends list
...
We may need to trick the friends list into refreshing when someone is muted to complete this feature...
probably need mutelist callbacks if those exist
2013-11-22 20:21:47 -05:00
Inusaito Sayori
7d98cf1891
[LLIMMgr/LLIMPanel] Woops, only allow invites to Adhocs!!
2013-11-22 18:41:34 -05:00
Inusaito Sayori
2d66022727
[LLIMMgr/LLIMPanel] Clean up the now redundant usage of isInviteAllowed()
2013-11-22 18:18:05 -05:00
Inusaito Sayori
15fefc231b
[LLIMMgr/LLIMPanel] isInviteAllowed should return based on mSessionType, not on mDialog.
2013-11-22 18:09:13 -05:00
Inusaito Sayori
53969d05d8
[LLIMMgr/LLIMPanel] Always allow Drag and Drop sharing of any inventory regardless of mDialog so long as mSessionType is P2P_SESSION
2013-11-22 18:00:58 -05:00
Inusaito Sayori
209e64b136
Merge llfloatertools.cpp with upstream to fix MATBUG-240
...
MATBUG-240: Unable to change media settings for an already applied media texture unless media texture is removed and reapplied.
2013-11-22 17:35:11 -05:00
Inusaito Sayori
f3f1727b49
Actually fix SV-1226
...
It happened because we filtered mFromName which started out as from_name, and inconsistently used the two after that...
This change switches to just using mFromName after that point..
SV-1226 #close Fixed it~
2013-11-22 00:49:47 -05:00
Inusaito Sayori
15dbce00ee
Prevent any RLVa filtering of music information as mentioned in SV-1226
2013-11-21 23:09:13 -05:00
Aleric Inglewood
2a7b96fab2
Increase connect time outs for SSL/TLS connections to 30 seconds.
...
On (very) slow machines this might improve the experience.
This only has effect on Second Life, since that's currently the only
grid that uses https for capabilities (all of them, except GetMesh,
GetMesh2 and GetTexture).
When linking the viewer with libmemleak, which significantly slows
down calls to malloc (and calloc, realloc, new, memalign and so on)
and free (delete), I no longer could download my inventory.
With this patch this was solved. The reason was that completing
the SSL/TLS handshake took more than 10 seconds (15 to 20).
2013-11-21 19:47:25 +01:00
Aleric Inglewood
1aa0a9be67
Minor bug fix.
2013-11-21 01:28:34 +01:00
Aleric Inglewood
53e26d4909
Compile fix for -DDEBUG_CURLIO
...
Since that fakes the libcwd macros, this is needed to compile
the recent change that allows to only turn on debugging output
for certain statemachine objects when DEBUG_CURLIO is defined,
but libcwd is not used (CWDEBUG is undefined).
2013-11-21 01:28:16 +01:00
Aleric Inglewood
bdef8dc185
Merge remote-tracking branch 'singu/master'
2013-11-20 15:13:25 +01:00
Siana Gearz
9c29488044
If the text is too skinny to render, don't crash
2013-11-20 10:33:15 +01:00
Siana Gearz
060628397b
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2013-11-20 05:50:03 +01:00
Siana Gearz
f23dc157be
Prevent accidental modification of vital stock grid
2013-11-20 05:49:43 +01:00
Shyotl
3715b7439d
Doer fonts fast(er)! (better batching for font glyph rendering)
2013-11-19 19:40:29 -06:00
Siana Gearz
cde5b23353
Limit avatar physics to 20-40 simulation steps per second to avoid wonky integration
2013-11-20 02:22:16 +01:00
Siana Gearz
07736106b1
Suppress asserts in fallback font loading
2013-11-20 02:20:58 +01:00
Siana Gearz
01744730a1
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer
2013-11-20 01:11:13 +01:00
Siana Gearz
c162b470b2
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2013-11-20 01:09:10 +01:00
Shyotl
5d2511e39e
More font cleanup and updating.
2013-11-19 17:56:27 -06:00
Aleric Inglewood
483b97a608
Merge remote-tracking branch 'singu/master'
2013-11-19 22:13:57 +01:00
Aleric Inglewood
ea0e25b92b
Make entering a Login URI in the grid manager more robust.
...
Before, when anything but the exact correct Login URI was entered, the
user would either get no error, or a pop up saying "Cannot retrieve grid
info from server."
With this patch, that pop up includes what went wrong and stresses that
they check if they entered the correct Login URI and where to find it.
I was motivated to write this after looking at crash report 8405 where
a user who had downloaded Singularity for the very first time crashed
twice when entering things like "aviworlds" and " aviworlds.com:8002"
(not the space), and "http:aviworlds.com:8002" (missing '//').
Especially in the light of FS accepting Login URI without the 'http://',
a lot of grid websites (like that of aviworlds) might instruct users
to enter the url without http://. Ie, this user was told to enter
just "aviworlds.com:8002", and when that failed was instructed to
add 'http' in front of it...
Now the code accepts also really WEIRD things, but will never mess
up a good entry. For example, if you enter "pssshht:aviworlds.com:8002"
then that will work, as a side effect. The real objective however is
of course to let things work like: "aviworlds.com:8002 ",
"http:aviworlds.com:8002", " http:/aviworlds.com:8002", and to give
a usable error message when there is a typo in the hostname (Cannot
resolve hostname) or they forget to add a port number (404, or
connection refused), plus the text "Make sure you entered the correct
Login URI. An example of a Login URI is: \"http://cool.grid.com:8002/ \",
this url can usually be found on the website of the grid."
2013-11-19 22:00:34 +01:00
Aleric Inglewood
06bebcc5c4
Bug fix for BlockingResponder.
...
Blocking http requests (code using responders derived from
BlockingResponder) *do* call getRaw() and getLLSD to get the body of
server error messages. It is therefore perfectly ok if mStatus !=
HTTP_OK.
2013-11-19 21:16:12 +01:00
Aleric Inglewood
63a6ed4f43
Fix floater xmls: tooltip must be tool_tip.
2013-11-19 20:26:55 +01:00
Latif Khalifa
26ca140e4b
Fixed symbol generation on Mac with channel specific packages
2013-11-19 08:47:18 +01:00
Latif Khalifa
054d67669f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-19 06:28:45 +01:00
Shyotl
503e5287cd
Fix minor oversight that broke openal audio impl.
2013-11-18 23:27:29 -06:00
Latif Khalifa
7187ceb0ac
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-19 05:14:46 +01:00
Latif Khalifa
594eacb480
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-19 04:44:55 +01:00
Latif Khalifa
f21bec1ab9
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-11-19 04:44:47 +01:00
Latif Khalifa
e6977de12f
Mac build changes to create specific channel installers
2013-11-19 04:19:48 +01:00
Latif Khalifa
c99f54367d
Use viewer channel as the basis for installer file names
2013-11-19 00:50:06 +01:00
Latif Khalifa
c6ec03ab19
Re-enable generating tarballs when packaging on Linux
2013-11-19 00:52:59 +01:00
Latif Khalifa
cce3809a26
Autogenerate version numbers on Mac too
2013-11-19 00:28:05 +01:00
Latif Khalifa
7183797e05
Autogenerated versioned windows resource files
2013-11-19 00:12:34 +01:00
Aleric Inglewood
7b9f854c66
Fix for 'with active responder' llerrs crash.
...
This fixes at least one case (crash report 8407), which comes
down to not cleanly informing a responder of failure when the
request url is empty (or so badly formed that it isn't a valid
url). As a result, the statemachine would abort() without
informing the responder - which is bad, sort of.
The previous cases where the responder needed to be informed
of a failure, namely "statemachine timed_out()" and "bad_socket()"
when a socket suddenly becomes bad for unknown reason, have been
replaced with the more general 'aborted()' function, which must
be called before the statemachine calls abort(). Clearly this
has been done for all cases of abort() now, so that if the
llerrs fires again in the future then that would have to be
after the statemachine calls finish(), which is still as "impossible"
as it was - hence the llerrs is still there to make sure.
The reason that this seldom happened on SL, and more often on
opensim, even more often on home-brew test grids, seems plausible:
malformed urls happen more in those cases.
I also took the opportunity to improve the robustness of cases
where the curl error code is checked: it makes no sense to check
what curl gives as error code when an internal error occurred.
2013-11-18 18:16:26 +01:00
Shyotl
b9d2ad3132
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2013-11-18 10:38:39 -06:00
Shyotl
8aa4d0fd27
Removed fasttimer that was hurting perf a tiny bit.
2013-11-18 09:58:21 -06:00
Shyotl
030588caaf
Underwater shadows.
2013-11-18 09:57:35 -06:00
Shyotl
be249ac8a1
Font update. Minor refactor, and removed some pointless code that was leaking.
2013-11-18 09:56:49 -06:00
Shyotl
2badc1c79c
Initialize LLListener_OpenAL::mRolloffFactor just to be safe.
2013-11-18 09:55:15 -06:00
Siana Gearz
3b8fbbc827
Clean up shaders on package and no longer final-package by default on Linux
2013-11-18 07:45:25 +01:00
Siana Gearz
a5103a1fc1
Sprinkle some Intel GPU support on Linux
2013-11-18 04:22:21 +01:00
Siana Gearz
749d0eec28
Merge https://github.com/abaph/SingularityViewer
...
Brings in support for MESA accelerators.
2013-11-17 16:38:06 +01:00
Latif Khalifa
0af470b2a9
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2013-11-17 12:45:32 +01:00
Latif Khalifa
97c505f941
Reset 'MotionResetsCamera' on camera reset
2013-11-17 12:45:14 +01:00
Latif Khalifa
c6ec2a531f
Alow alt-camming and terrian parcel selection from farther away.
...
Thanks to Liru for finding the sport
2013-11-17 12:28:06 +01:00
Drake Arconis
3e2f1a8fd9
Changed singularity prebuilt cache dir to sg.install.cache
2013-11-16 14:28:25 -05:00
Drake Arconis
7fa5abd4d1
Added NVAPI support on windows
2013-11-16 14:01:09 -05:00
Drake Arconis
924908f2ad
Imported new revoke anim perms code and refactored related bits
2013-11-15 19:51:21 -05:00
Aleric Inglewood
bddb1ba48c
Merge remote-tracking branch 'singu/master'
2013-11-15 18:00:49 +01:00
Aleric Inglewood
a8cded0cf6
Allow calling LLNotificationsUtil::add from any thread.
...
This makes LLStringUtil thread-safe by removing a rather unnecessary
LLFastTimer from LLStringUtil::format.
Same thing for LLTrans::getString and LLTrans::findString, where
even a comment stated that the author wasn't interested in measuring
cpu time at all. In this case I added some code back to make sure
that we're not calling LLTrans::getString() in an inner loop, which
was the reason that the LLFastTimer was added.
Made one string static to avoid 45000 look ups during login, which
kinda triggered the above test.
Finally, LLNotificationsUtil::add is made thread-safe by making
LLNotificationChannelBase::mItems thread-safe and defering a call
to LLNotifications::updateItem to the main thread when called
from another thread (using a little statemachine).
2013-11-15 17:52:52 +01:00
Latif Khalifa
14c43aa9a2
Fixed camera pan
2013-11-14 20:36:07 +01:00
Latif Khalifa
f273d3ff59
Singularity 1.8.4
2013-11-14 12:51:41 +01:00
Latif Khalifa
1bd78c5398
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-14 02:51:36 +01:00
Shyotl
fc4f0eaa82
Particle glow tweak excluded more faces from glow than intended.
2013-11-13 19:39:14 -06:00
Salvatore La Bua
8ad3b87c0e
Fix a render issue with Hightlight Transparent
...
The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.
2013-11-13 21:16:58 +01:00
Latif Khalifa
133dffb326
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-13 20:12:25 +01:00
Shyotl
01e27eac76
Kill a tiny bit of dead code.
2013-11-13 13:06:47 -06:00
Shyotl
d4a3cb168c
Altered the deferred alpha fragment shader to handle alphamasking when drawing avatar hair/skirts. (Special handling for these two seems weird, considering all other mesh parts are also alphamasked.. It also prevents skirts from casting shadows. Future alteration may be desired.)
2013-11-13 12:59:21 -06:00
Shyotl
f03376cd2a
Remove hack for nvidia on osx.
2013-11-13 12:53:43 -06:00
Inusaito Sayori
6bd9649277
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-11-13 13:03:27 -05:00
Damian Zhaoying
6e05e49a45
update spanish translations in strings.xml and floater_model_preview.xml files
2013-11-13 12:56:38 -03:00
Latif Khalifa
fcf061d06b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-13 13:01:21 +01:00
Latif Khalifa
a3b232f389
Merge remote-tracking branch 'lightdrake/master'
2013-11-13 12:51:31 +01:00
Shyotl
3416b837dc
Added setting 'SHAlwaysSoftenShadows' to soften shadows when ssao isn't enabled. Removed a couple dead settings.
2013-11-13 02:31:55 -06:00
Shyotl
ba84bf1461
Avoid needless second pass on non-glow particles.
2013-11-13 02:27:01 -06:00
Shyotl
3ed249cba5
Retain cubemap reflection on shiny faces while in shadowed, but don't bloom the sun reflection.
2013-11-13 01:35:31 -06:00
Shyotl
584e5176a4
Err closer to LL regarding shadows, however also fixed alpha face shadows to look like all other shadows.
2013-11-13 01:30:45 -06:00
Drake Arconis
e5fcd54c92
Add option to disable scroll offset changing modifier
2013-11-12 23:47:28 -05:00
Damian Zhaoying
899a21ca24
Merge remote-tracking branch 'Liru/master'
2013-11-12 16:09:05 -03:00
Inusaito Sayori
29a07f4b5c
Actually fix the french translations (codepage borks yay) Thanks Nomade
2013-11-12 03:03:20 -05:00
Inusaito Sayori
2e7d80e9ba
Let shift-left-clicking in the middle of subpiemenus move back to the parent piemenu!
2013-11-12 02:02:16 -05:00
Inusaito Sayori
d678735cf6
Code cleanup in pie menu
...
Cleaned up hover logic and slice from x and y code duplication
(Best viewed without space changes)
2013-11-12 02:00:21 -05:00
Latif Khalifa
6b5875c008
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-12 02:00:53 +01:00
Shyotl
203ae9dfa3
Fix uninitialized variable warning in alphaF.glsl. Also made USE_VERTEX_COLOR actually work if FOR_IMPOSTOR is set.
2013-11-11 18:56:16 -06:00
Latif Khalifa
00b57dd40e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-12 01:01:10 +01:00
Latif Khalifa
f10402cbdb
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-11-12 01:01:01 +01:00
Shyotl
32ecf444bd
Attempt to resolve shader compilation errors on osx since it's particularly picky.
2013-11-11 17:48:54 -06:00
Latif Khalifa
3430a31e9d
Fixed fetching inventory when UseHTTPInventory is disabled
2013-11-11 11:50:07 +01:00
Inusaito Sayori
943f77eed0
Fix the UI Warnings in LLFloaterModelPreview
...
Adds the green check and red x icons
Adds Price Breakdown text to the mesh upload floater, quite useful!
Removes useless ui element references in only code
Comments out ui element references in only code that we don't have and don't have a clear place
2013-11-10 19:12:20 -05:00
Damian Zhaoying
801723813a
update spanish traslation to reflect new materials feature options
2013-11-10 17:39:51 -03:00
Inusaito Sayori
69f2203d11
The rest of the french updates from Nomade Zhao
2013-11-10 13:05:58 -05:00
Latif Khalifa
7879509727
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-10 11:14:08 +01:00
Latif Khalifa
c6a7ae51e6
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-11-10 11:13:55 +01:00
Inusaito Sayori
91ed289a93
[Warnings] Fix signed/unsigned mismatch in llpartdata.cpp
2013-11-10 02:51:30 -05:00
Inusaito Sayori
be7c33e3c7
[LLScrollColumnHeader] Fix the ImageOverlay icons being overwritten every draw and thus destroying our image_overlay parameter!
...
Seriously, whose idea was that?
Ignore space changes and this will be a lot easier for all of us.
2013-11-10 02:49:10 -05:00
Inusaito Sayori
a510af9480
[LLScrollColumnHeader] Fix icons disappearing in certain states, such as click.
2013-11-10 02:46:23 -05:00
Shyotl
297cd58295
Revert upstream change to particle index accounting. (Fixes flicker issues)
2013-11-09 22:23:48 -06:00
Aleric Inglewood
5f9c6f1b08
AIAlert fixup.
2013-11-09 15:43:58 +01:00
Shyotl
0d1c98b5f7
Fix shadow dithering. It's still pretty ugly tho, but looks okay if ssao is enabled. May add random kern in the future.
2013-11-08 02:03:21 -06:00
Aleric Inglewood
a7e72ceb32
AIFile bug fixes.
...
Compare with errno instead of rc.
Make sure errno is preserved.
2013-11-07 18:20:49 +01:00
Latif Khalifa
c629d2625c
Fixed Mac build
2013-11-07 04:35:39 +01:00
Latif Khalifa
27322c07db
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-11-07 02:01:35 +01:00
Aleric Inglewood
caa82cf5e4
Workaround for window min/max macros
2013-11-07 02:00:24 +01:00
Aleric Inglewood
ee1ca0ed99
Compile fixes for windows(?)
2013-11-07 01:44:57 +01:00
Latif Khalifa
a7a2b0c227
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-11-07 01:07:21 +01:00
Latif Khalifa
1ab5c6a32a
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2013-11-07 01:07:14 +01:00
Latif Khalifa
2234e95d5c
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-11-07 01:06:53 +01:00
Inusaito Sayori
511b0cfb9c
ContextMenu Support!
...
LLContextMenu functionality pulled out of LLPieMenu, PieMenu is now derived from LLContextMenu
- The more attribute boolean of pie_menu element determines whether or not to have an actual submenu if it's not a pie, defaults to false which means actual submenu..
-- in the future we may want to have more more="true" depending on feedback
- Pie menu labels now dynamically get " >" appended to them (avoids stupid looking context menus)
- Positioning logic combined in part, mostly conditional still, in the future we could probably combine it more.
- handleHoverOver function combines common functionality between context and pies given an item and hover mouse coords.
LiruUseContextMenus debug setting determines which to use, default is pie, of course
- Context(/Pie) Menus are rebuilt when the setting changes value
-- this is safe at any point because all startup states have been accounted for
- "Use context menus instead of pie menus" added to System->General preferences (it's close to the bottom)
2013-11-06 18:47:02 -05:00
Inusaito Sayori
f41c4dd273
Don't open disabled submenus!
2013-11-06 17:44:11 -05:00
Inusaito Sayori
cb0cc571ee
Mats UI.
...
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter()
Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding)
Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors.
Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream.
Translators:
panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed.
strings.xml now has "use_texture" string.
notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
2013-11-06 17:39:04 -05:00
Inusaito Sayori
06186e6c7e
[VarRegions] Pseudosupport for region_size_y.
2013-11-06 15:53:15 -05:00
Inusaito Sayori
659874dce0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-06 01:10:47 -05:00
Shyotl
322ceceb60
Added shaders needed to display texture 'edit' overlay using the specular/normalmap texcoords.
2013-11-05 23:51:09 -06:00
Aleric Inglewood
254396596c
Merge remote-tracking branch 'singu/master'
2013-11-05 22:40:08 +01:00
Aleric Inglewood
c516a71804
Move AIAlert* into namespace AIAlert and rename classes.
...
Instead of having several AI* classes, it turned out to be easier to
have a namespace: this allows me to define the classes in llcommon but
add (new) 'add' and 'add_modal' functions to 'AIAlert' in llui.
This is needed to avoid a collision with the 'add' functions in
LLNotificationsUtil.
The new add/add_modal makes it a lot easier to just show a caught
alert, prepending or appending new text: it turns out that that is
way more common then a re-throw.
Adjusted code as appropriate.
2013-11-05 22:30:02 +01:00
Aleric Inglewood
8ab9039ff6
Use " and ' instead of " and ' for new msgs in strings.xml.
...
Since it works... this might actually be better readable and therefore
easier to work with for the translators.
2013-11-05 18:10:05 +01:00
Aleric Inglewood
b5b51bd73b
Typo fix in example code.
2013-11-05 15:11:18 +01:00
Latif Khalifa
d8db37f3fb
Simplify tag decoding,
...
Disable showing other's tags by default as it appears broken in most viewers
2013-11-05 07:25:11 +01:00
Inusaito Sayori
5a2ec28ddf
Refactor panel_tools_texture.xml file in preparation to merge (nothing changed yet)
...
Pulled out defaulted/dead attributes, switched to v3 markup stylings. Merged in some norspec comments.
2013-11-04 23:00:15 -05:00
Inusaito Sayori
31e2fdc16e
Allow v3 xui alternative naming of combo_item as combo_box.item
2013-11-04 22:56:36 -05:00
Inusaito Sayori
f935453859
Allow v3 xui style strings for anything panel derived. <panel.string/>
2013-11-04 22:54:44 -05:00
Aleric Inglewood
1a9cf9b013
Bug fix for 54b43f1ad7
...
Initialize mLastSimAccess.
2013-11-05 03:55:40 +01:00
Aleric Inglewood
2453c13e11
Add AIXMLLindenGenepool - redo of archetype export/import using AIXML*.
...
In order to remove code duplication, and as prove of concept,
I redid the linden_genepool archetype export and import (from the Edit
Appearance Floater), using AIXML and AIAlert.
The import/export code did shrink significantly, and became a lot
simpler. Although a new file pair (aixmllindengenepool.{cpp,h}) is
added to define the (de)serialization of the linden_genepool XML format,
that code is now centralized in one place, and still a lot simpler.
As a bonus however, every possible error is now semi-automatically
reported to the user with all details that might help to overcome
the problem, like file names and system errors.
2013-11-05 03:01:49 +01:00
Aleric Inglewood
d174b7fcf8
Add AIXMLRootElement, AIXMLElement, AIXMLParser and AIXMLElementParser
...
The AIXML* classes provide an Object Oriented way to serialize objects
to and from an XML file. Documentation is added at the top of aixml.cpp
These classes will be used by AIMultiGrid.
2013-11-05 03:01:48 +01:00
Aleric Inglewood
d549e549d8
Fix xml parser.
...
This fixes quoted strings, like <tag>"Hello \"World\""</tag>,
which otherwise might not be processed correctly because
the XML_CharacterDataHandler isn't guaranteed to be called
exactly once per element. It certainly isn't when a string
contains entities, ie: <tag>"'Hello \"World\"'"</tag>
certainly fails to be unescaped with the old code.
Moreover, the old unescape code things that a singly quote
is actually a quoted string (not noting that begin and end
quote are the same) and destructs all " entities; also
fixed with this commit.
2013-11-05 03:01:47 +01:00
Aleric Inglewood
78673e4a94
Add AIFile - LLFile but throws AIAlertCode exceptions on error.
...
The code is the current errno.
2013-11-05 03:01:47 +01:00
Aleric Inglewood
193010e947
Add THROW_[MF]ALERT[EC] (AIArgs, AIAlert, AIAlertCode, AIAlertPrefix, AIAlertLine)
...
A system to throw errors that allow for easy error reporting to the user
by showing a translated pop-up alert box with the error message.
The messages use strings.xml for translation and allow the usual
replacement args (ie [FILE] is replaced with a filename).
The exceptions can be cascaded, by adding more (translated) text
when caught and then re-throwing the result.
Macros are being used to support adding a function name prefix
to a message of the current function that the exception is thrown
from.
The syntax is:
<macro>(<line>); to show 'line'
<macro>(<alert>, <line>); to append 'line' to a caught alert.
<macro>(<line>, <alert>); to prepend 'line' to a caught alert.
where <macro> is one of:
THROW_ALERT, THROW_MALERT, THROW_FALERT, THROW_FMALERT,
THROW_ALERTE, THROW_MALERTE, THROW_FALERTE, THROW_FMALERTE, where
M = modal, F = Function name.
and where <line> is one of:
<xmldesc>
<xmldesc>, AIArgs<args>
where <xmldesc> is a string literal that will be looked up
in strings.xml, and <args> is:
(<key>, <replacement>)[<args>]
There are more variations of the macros to throw an arbitrary
class (append _CLASS), include an int code (append C) or
to store the current errno as code (append E).
For example, THROW_MALERTC(code, ...), or THROW_FALERT_CLASS(Foobar, ...),
where the ... is the same as for the macros above.
Documentation and example usage has been added to aialert.h.
2013-11-05 03:01:47 +01:00
Aleric Inglewood
b7d2683b76
Removed LLXMLNode::writeHeaderToFile
...
Isn't used. This header is written else where already,
and will be written from now on (also) by AIXML*, which
will be committed next.
2013-11-05 03:01:46 +01:00
Aleric Inglewood
2f53f7232b
Minor LLMD5 extension and cleanup.
...
* Add LLMD5::clone(unsigned char const*), the inverse of LLMD5::raw_digest.
* Add LLMD5::clone(std::string const&), the inverse of LLMD5::hex_digest.
* Add LLMD5::isFinalized(), returns true if the object is finalized.
* Turn all binary operators into inline friends in the class.
* Fix operator<< to take a LLMD5 const& instead of a LLMD5&.
These changes are needed for / used by AIMultiGrid.
2013-11-05 03:01:46 +01:00
Aleric Inglewood
b424d0232b
Make #includes in llcommon header files more complete.
...
These includes are needed. The current code includes them
in .cpp files *before* including these include files, but
that is not very clean, and not useful.
Actually including what a header file needs makes it more
clear what it drags in, it doesn't drag in more then before.
It also allows to include these headers without having to
includes needed for the included header file in a specific
order, in every .cpp file.
2013-11-05 03:01:46 +01:00
Aleric Inglewood
54b43f1ad7
Cache the lookup of the sim access level.
...
Being part of the state line, it is called every frame, causing a
translation lookup every frame.
2013-11-05 03:01:46 +01:00
Latif Khalifa
7ffb751ead
In preparation to release, change defalt for crash reporting to 'Ask'
2013-11-05 02:35:08 +01:00
Inusaito Sayori
7129d97ee5
panel_tools_texture.xml splits off from floater_tools.xml (No real changes here, but this change will make life so nice for me)
2013-11-04 17:49:29 -05:00
Inusaito Sayori
ec55c53b62
French menu gets Motion Resets Camera courtesy of Nomade (more translation on the way)
2013-11-04 17:10:42 -05:00
Drake Arconis
e1356b7aaf
Fix slight breakage in the osx cmake
2013-11-03 23:00:56 -05:00
Latif Khalifa
0cbaa752a6
At the request of LL, append more info to channel string sent to the login server
...
Send versio number bare, without channel name, as V3 does
2013-11-04 04:04:39 +01:00
Inusaito Sayori
2f80012ccd
Feature Request: If EditLinkedParts is on, Copy Key should copy keys of any selected prim(s)
2013-11-03 20:51:48 -05:00
Drake Arconis
1553a90ebb
Merged master
2013-11-03 20:15:41 -05:00
Latif Khalifa
7fe411cd85
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-11-03 21:48:21 +01:00
Inusaito Sayori
083aaffec7
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-11-03 15:28:01 -05:00
Andros Baphomet
997fdebb9f
Re-fix shader compilation errors
2013-11-03 13:12:27 -05:00
Andros Baphomet
fe0a761ce6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
indra/newview/app_settings/shaders/class1/deferred/giF.glsl
indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
2013-11-03 12:17:50 -05:00
Latif Khalifa
232b1cf28c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-03 04:56:31 +01:00
Shyotl
6bbb24b974
Revert occlusion changes to try and pinpoint flicker issue.
2013-11-02 22:43:11 -05:00
Shyotl
827bbc9b89
Fix up a few glowies.
2013-11-02 19:15:28 -05:00
Latif Khalifa
822b728adb
Only build Quicktime on 32 bit Windows
...
Helps address issue 1180
2013-11-03 00:32:01 +01:00
Latif Khalifa
8ed527af24
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-02 12:46:16 +01:00
Shyotl
77eb928380
Add LLGLManager::mIsMobileGF
2013-11-02 03:33:21 -05:00
Shyotl
378dd14ade
Return to our nice ssao.
2013-11-02 03:29:32 -05:00
Shyotl
e5d71560e8
Fix fullbright stuff in deferred. Have to re-assess old glow occlusion bugfixes.
2013-11-02 02:38:23 -05:00
Latif Khalifa
824f23082b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-11-02 07:25:36 +01:00
Shyotl
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Inusaito Sayori
23e9eabedb
These new icons need tooltips
2013-11-01 17:57:52 -04:00
Latif Khalifa
b9c487a0c7
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-11-01 22:50:22 +01:00
Inusaito Sayori
96e8f37c81
The rest of some touchups to wlf xml for nicer alignment of elements
2013-11-01 17:43:32 -04:00
Inusaito Sayori
0fc9d540bf
Feature Request: Add Camera preset switching functionality (part of quicksettings)
...
Hitting Escape will reset to the normal Back preset
Adds new Cam_Preset_*_(On|Off).png textures, these should probably be reskinned, any volunteers?
2013-11-01 17:35:12 -04:00
Latif Khalifa
1f587d1ad1
Don't crash when trying to export linked parts
...
Fixes issue #1176
2013-11-01 22:34:55 +01:00
Inusaito Sayori
2d421a27e1
Let Ctrl/Shift + scrollwheel changing the camera/focus offsets affect the current preset's setting, not the back preset.
2013-11-01 16:56:55 -04:00
Inusaito Sayori
3934e0c9d3
Fix Issue 1163: Mouselook zoom (silly control group confusion)
2013-11-01 11:18:12 -04:00
Inusaito Sayori
ba1a29aae2
French Translation updates! Provided by Nomade Zhao
2013-11-01 02:56:21 -04:00
Aleric Inglewood
66a43ea537
Make global strerr() functions in llfile.cpp static member functions of LLFile.
...
This is the cleanest way to make them available to the rest of the
viewer as exported functions.
This change is needed for / use by AIMultiGrid.
2013-11-01 00:47:47 +01:00
Latif Khalifa
3d47d6f0dc
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-10-31 16:39:08 +01:00
Latif Khalifa
5583445c4d
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-31 16:38:40 +01:00
Aleric Inglewood
198840f839
Merge remote-tracking branch 'singu/master'
2013-10-31 05:45:25 +01:00
Latif Khalifa
78843493cc
Syntax error fix
2013-10-31 03:31:12 +01:00
Aleric Inglewood
4aa3863f17
Merge remote-tracking branch 'singu/master'
2013-10-31 02:54:00 +01:00
Latif Khalifa
fcfffbb322
breakpad filter signature is different on windows compated to other platforms
2013-10-31 02:51:58 +01:00
Aleric Inglewood
e4b35a050d
This makes more sense
2013-10-31 02:38:23 +01:00
Aleric Inglewood
8506a16dcb
Merge remote-tracking branch 'singu/master'
2013-10-31 02:19:37 +01:00
Latif Khalifa
8dab5df746
Revert "Prevent LLFace::getGeometryVolume from overwriting vbos past their end."
...
This reverts commit 02067f973e .
2013-10-31 02:10:57 +01:00
Aleric Inglewood
811191cc7c
Merge remote-tracking branch 'singu/master'
2013-10-30 21:57:39 +01:00
Aleric Inglewood
a9972bbf02
Suppress spammy warning (debug mode)
2013-10-30 20:32:22 +01:00
Latif Khalifa
51d5984afa
Allocate half a megabyte that is freed just before minidump is written in the breakpad exception handler (Siana)
2013-10-30 19:10:17 +01:00
Latif Khalifa
f1eab3f2c5
Added architecture fields to the crash report
2013-10-30 19:09:05 +01:00
Latif Khalifa
139aad333a
Looks like the older version of freetype has more sever issues.
...
Revert "Downgraded freetype to 2.3.9 to avoid font issues in the newer version"
This reverts commit 3284b77df2 .
2013-10-30 18:43:17 +01:00
Andros Baphomet
c009866d86
Merge remote-tracking branch 'upstream/master'
2013-10-30 09:42:58 -04:00
Inusaito Sayori
73cb43e71f
[Warnings] Fix ..\..\libhacd\hacdRaycastMesh.cpp(109): warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
...
All the other involved types are of size_t, so static_cast 1 should work here.
2013-10-30 08:40:47 -04:00
Inusaito Sayori
b34a8db34a
Modernize constructor of LLPreviewSound and cure crash signature 314
2013-10-30 08:37:20 -04:00
Damian Zhaoying
9be72ffb47
add spanish translation for prefs editor open log in windows option
2013-10-30 05:01:12 -03:00
Latif Khalifa
e6f70a0864
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-10-30 05:24:53 +01:00
Latif Khalifa
0933b8c43d
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
2013-10-30 05:24:31 +01:00
Melanie
dfc965954e
Remove attachments from the avatar's attached list before destroying them.
...
This should prevent the idle callbacks from accessing deleted attachments when looking for the CCS signature.
2013-10-29 22:26:58 +01:00
Latif Khalifa
02067f973e
Prevent LLFace::getGeometryVolume from overwriting vbos past their end.
...
Possible fix for a crash in LLFace::getGeometryVolume()
Patch by NickyD/Firestorm
Crash signature: 14 and 20
2013-10-29 16:29:59 +01:00
Inusaito Sayori
ec4679c2a8
Fix the bug in which right click and then delete key would no longer work to delete objects
...
Navigation handling without a currently selected menu entry now only happens if key is up or down arrow
(mind the space changes)
2013-10-29 06:25:22 -04:00
Latif Khalifa
bdcc4189be
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-28 22:22:29 +01:00
Latif Khalifa
6b2628db44
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-10-28 22:22:22 +01:00
Latif Khalifa
664d5ab7fc
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-28 22:22:14 +01:00
Latif Khalifa
3284b77df2
Downgraded freetype to 2.3.9 to avoid font issues in the newer version
2013-10-28 22:21:07 +01:00
Latif Khalifa
2c1512dcbe
Try finding FMOD Ex from registry intall path instead of hard coded location
2013-10-28 20:38:51 +01:00
Latif Khalifa
d8728f17ee
Don't install 64 bit viewer on 32 bit OS
2013-10-28 20:23:35 +01:00
Latif Khalifa
603221fa48
Rebuilt glod using VC11 runtime
2013-10-28 19:26:17 +01:00
Inusaito Sayori
8670f45287
Fix mouselook crosshair drawing properly
2013-10-28 12:22:58 -04:00
Aleric Inglewood
aa5bc7bc25
Compile fix (libcwd)
2013-10-27 15:14:11 +01:00
Shyotl
5e8c7264da
Fix artifacts from local stash merge.
2013-10-26 19:58:54 -05:00
Shyotl
6474568125
Call updateLOD when geom enters rigged state.
2013-10-26 19:09:43 -05:00
Shyotl
c1feb11d98
SH-3860. Cloud on first load issue. I'm sure the inaccessible jira has more details...
2013-10-26 18:56:39 -05:00
Shyotl
edf75a7174
setCommitOnReturn moved to from llbutton to lluictrl, cleanup some focus/key handling, avoid needless reshape calls.
2013-10-26 18:12:56 -05:00
Shyotl
30c5b9514e
Let the rendertarget dictate internal format when resizing.
2013-10-26 18:09:34 -05:00
Shyotl
8e55d5499e
Occlusion FBOs in deferred.
2013-10-26 18:07:56 -05:00
Shyotl
574022ed2c
Made a few more fullbright face types occlude any glow behind them.
2013-10-26 18:01:36 -05:00
Shyotl
fc04f6b2e1
Added handling of GL_LUMINANCE pixel format to setManualImage. Was missing, although GL_LUMINANCE_ALPHA and GL_ALPHA were handled.
...
Also added missing file hurr.
2013-10-26 16:42:41 -05:00
Shyotl
7c7c64bde3
Minor upstream catchup. Added LLImageRaw::duplicate and no_copy parameter to LLImageRaw::LLImageRaw
2013-10-26 16:39:31 -05:00
Shyotl
2a432f73da
Try and squelch some warnings regarding nightvision post shader on amd gpus.
2013-10-26 16:36:38 -05:00
Shyotl
f4863527aa
Migrate ui scale/translation transform matrix stacks to LLAlignedArray.
2013-10-26 16:29:38 -05:00
Shyotl
8441bc80a4
Use LLStaticHashedString for faster uniform lookup.
2013-10-26 16:26:46 -05:00
Latif Khalifa
3979ad46f6
Separate out the cache directory for windows 64
2013-10-24 10:24:18 +02:00
Latif Khalifa
f4f4a39c01
Revert accidental removal of tcmalloc for 32 bit
2013-10-24 09:53:51 +02:00
Inusaito Sayori
fcce986266
Fix crash signature 256
2013-10-24 02:38:47 -04:00
Latif Khalifa
bcfe5232fb
Merge branch 'windows64' of github.com:lkalif/SingularityViewer
2013-10-24 01:37:45 +02:00
Latif Khalifa
6708019a40
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-24 01:37:27 +02:00
Latif Khalifa
8565616c9d
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-24 01:37:19 +02:00
Latif Khalifa
938736b77f
Win64: moved prebuilts to their permanent location
2013-10-24 01:25:45 +02:00
Shyotl
8e94c43a54
Fix a tp crash, and rework sound preloading slightly.
2013-10-23 17:23:20 -05:00
Inusaito Sayori
2b7e78cb3b
That commit where I touch all the ascentprefs headers to make them conform to standard because it's been annoying me too long.
2013-10-23 17:47:33 -04:00
Inusaito Sayori
41303d0c9c
Added "Log button opens external text editor (Windows only)" to Adv. Chat UI
2013-10-23 17:44:27 -04:00
Inusaito Sayori
4821d02051
Sometimes UI get this syncing feeling... but then everything seems fine.
2013-10-22 23:59:50 -04:00
Inusaito Sayori
fd42029a61
LLViewerWindow::handleKey(): Partial Fix for Issue 704: Keyboard shortcuts that should be passed to focused text fields are instead passed to selected prims when building
...
All edit keys now work, but Ctrl-A still doesn't work right, it must be grabbed by something else...
Adds LLFocusMgr::keyboardFocusHasAccelerators()
Adds virtual bool LLView::hasAccelerators() which returns false by default, overrides returning true placed in LLPreviewScript and LLPreviewNotecard
Shortcut keys added to notecard and script menu xmls
I'm thinking Qarl's Align tool handling may be receiving the Ctrl-A, we do seem to handle it differently than Exodus and Firestorm something modern could have broken the old way..
Come to think of it, those two features(Align and Select all prims) have a longstanding shortcut conflict in shortcuts... that's pretty nasty
2013-10-22 23:35:53 -04:00
Inusaito Sayori
574d0dab8d
LLViewerWindow::handleKey(): Also handle keys for navigating through the displayed menu
2013-10-22 22:39:15 -04:00
Inusaito Sayori
1aee941cb6
LLViewerWindow::handleKey(): The work in progress bits of the sync, commented out
2013-10-22 09:19:38 -04:00
Inusaito Sayori
75ee99f4d5
LLViewerWindow::handleKey(): More harmlessness (sync)
...
Handle Tabbing through elements/floaters earlier.
Combine g*Menu*View handleKey() checks.
2013-10-22 09:08:41 -04:00
Inusaito Sayori
45cd0157ef
LLViewerWindow::handleKey(): Code cleanup, bit of harmless sync
...
Moved Notifications Console into the advanced menu for login, so it's not shoved in as a hack, also a bit easier to access
2013-10-22 08:16:12 -04:00
Latif Khalifa
b800e877f9
More manifest gymnastics
2013-10-22 14:01:46 +02:00
Inusaito Sayori
9ec10cf246
Reworked LLToolCompGun so piemenu in mouselook plays nicer with zoom feature
...
Switches to exodus implementation
Includes relicensing of LLViewerCamera and LLToolComp
Maintains use of the old saved zoomed setting
2013-10-22 07:47:43 -04:00
Latif Khalifa
f545952136
Copy vc++ runtime libs, ignore size_t related warnings in the release build on win64
2013-10-22 11:25:32 +02:00
Latif Khalifa
f7cea9ac74
Added a way to identify 64 bit viewer in help -> about
2013-10-22 01:08:39 +02:00
Latif Khalifa
22db8f56f1
WIP[win64]: installer
2013-10-22 00:59:26 +02:00
Latif Khalifa
5cd7f05851
VS2012 related changes
2013-10-22 00:58:05 +02:00
Inusaito Sayori
dde18dfc0f
Added a setting, LiruMouselookMenu, in case people don't want this feature.
2013-10-21 16:01:31 -04:00
Inusaito Sayori
d95e1800e1
Miscellaneous touchups
...
Fixes chatbar not handling ctrl+shift+arrow for word selection
lltoolmgr.cpp sync
Removes some pointless dead code from llviewertexteditor.cpp
2013-10-21 15:15:17 -04:00
Latif Khalifa
73e1a9ad78
WIP[win64]: we haz 64 bit webkit
2013-10-21 20:42:31 +02:00
Latif Khalifa
ea6adb7ae4
WIP[win64]: Sync this snipped with upstream to avoid texture indexing issues on Windows 64
2013-10-21 15:56:13 +02:00
Latif Khalifa
93e62a375c
WIP[win64]: Rebuilt jpeglib, libpng, fixed loading of fmodex
2013-10-20 20:17:03 +02:00
Latif Khalifa
52c8c68d12
Reduce unbearable notification span when a plugin fails to load
2013-10-20 20:16:21 +02:00
Latif Khalifa
f9531904f5
WIP[win64]: Rebuilt jpeglib
2013-10-20 18:07:23 +02:00
Latif Khalifa
17c59f25f5
WIP[win64]: it builds, runs. webkit disabled in cmake for now
2013-10-20 17:03:48 +02:00
Latif Khalifa
6bae4a8d92
WIP: native win64 support
2013-10-20 12:37:35 +02:00
Inusaito Sayori
a33efc61a2
Feature request by StephiDreamEvermore Doune: Implement the convenience of being able to set view offsets while modifier keys are held during scroll in third person camera (Play with camera position/angle)
2013-10-19 20:54:02 -04:00
Inusaito Sayori
bd4e988397
Fix crash signature 222
2013-10-19 20:38:50 -04:00
Latif Khalifa
32bed5660a
WIP win64 support
2013-10-19 23:05:53 +02:00
Latif Khalifa
d03a012a41
Added support for Visual Studio 2012 to develop.py and VSTool
2013-10-19 21:10:24 +02:00
Andros Baphomet
c264607207
Merge remote-tracking branch 'upstream/master'
2013-10-19 10:03:17 -04:00
Latif Khalifa
290b3d7106
Added Windows 64 support to repackage.sh
2013-10-19 15:29:08 +02:00
Inusaito Sayori
65d2775e2a
Address jonhboy's Request: Round land impact instead of chopping off the decimal
2013-10-18 08:58:13 -04:00
Inusaito Sayori
ef3f78175c
Satisfy Issue 699: Let Alt-right clicking in mouselook bring up pie menu
...
Also lltoolpie.cpp cleanup
2013-10-18 08:28:39 -04:00
Inusaito Sayori
7813ca03da
LLFloaterInspect: bit of cleanup and allow sorting by creation date regardless of format
2013-10-18 08:21:57 -04:00
Inusaito Sayori
ec5aaa2af8
Modernize LLSelectMgr and fix leaks
2013-10-18 08:20:19 -04:00
Latif Khalifa
4feb1985b0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-18 09:28:19 +02:00
Shyotl
addd687bf8
What is this? Where am I? Oh god. (Fix mistake in openal audioimpl)
2013-10-18 02:27:09 -05:00
Latif Khalifa
153f783922
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-18 08:51:51 +02:00
Shyotl
e2954fdbfd
Fixed a bug where multisampled renderbuffers were being attached to non-FBO-enabled LLRenderTargets.
2013-10-18 01:43:32 -05:00
Shyotl
6fd73ee8bb
Use GL_RED instead of GL_LUMINANCE for post-process noise texture.
2013-10-17 22:07:58 -05:00
Shyotl
19d7186508
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2013-10-17 21:08:30 -05:00
Latif Khalifa
c67f848b5c
Merge branch 'master' of https://github.com/siana/SingularityViewer
2013-10-17 05:25:14 +02:00
Latif Khalifa
683bd9375f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-17 05:25:02 +02:00
Shyotl
d18fa5ba42
Modified LLRenderTarget to handle sCurFBO and mPreviousFBO as pointers instead of arbiturary indexes.
2013-10-16 21:35:04 -05:00
Shyotl
03c4535648
Made further refinements to the audioengine:
...
-Looping syncslaves are stopped when there is no syncmaster.
-Hardened against edge cases regarding soundsource priority sorting.
-Fixed issue with syncmasters being marked as having looped when instead they just started playing (caused double-start of syncslaves).
-Updated some comments.
2013-10-16 21:32:08 -05:00
Aleric Inglewood
811f670199
AIStateMachine fixes.
...
Things (one debug code only) that don't happen currently,
but that I ran into with AIMultiGrid.
2013-10-16 00:30:28 +02:00
Inusaito Sayori
9dd995a287
Old dead code poofpoof
2013-10-15 17:21:54 -04:00
Aleric Inglewood
e40d622b8c
Merge remote-tracking branch 'singu/master'
2013-10-15 23:07:34 +02:00
Aleric Inglewood
09708b6318
Added AICondition.
...
AICondition is like AIThreadSafeSimpleDC (it is derived from it),
and wraps some variable, protecting it with a builtin mutex.
While in a statemachine, one can call wait(condition) to make
the state machine go idle, and call condition.signal() to
wake it (or another) up again.
While normally a condition variable is used as follows:
condition.lock();
while (!whatwerewaitingfor)
{
condition.wait();
}
// Here the condition is guaranteed to be true and we're
// still in the critical area of the mutex.
condition.unlock();
where the thread blocks in wait(), the statemachine actually
returns CPU to the thread (the AIEngine), so there is no
while loop involved, and our wait() doesn't even unlock
the mutex: that happens because the state machine returns:
condition_wat condition_w(condition); // Lock condition.
if (!condition_w->whatwerewaitingfor()) // The variable(s) involved can only be accessed when condition is locked.
{
wait(condition); // Causes the state machine to go idle. This does not block.
break; // Leave scope (unlock condition) and return to the mainloop - but as idle state machine.
}
// Here the condition is guaranteed to be true and we're
// still in the critical area of the condition variable.
In this case, when condition.signal() is called, the thread
doesn't return from wait() with a locked mutex - but the
statemachine executes the same state again, and enters from
the top: locking the condition and doing the test again,
just like it would be when this was a while loop.
2013-10-15 22:30:53 +02:00
Aleric Inglewood
9114f04ef6
Add AIStateMachine::yield_if_not
...
This can be used to switch to a specific engine.
If the state machine is not running in the passed engine,
then it performs a yield to that engine, otherwise it keeps
running. Hence, putting this at the top of a state
guarantees that it runs in that engine.
For example:
case FrontEnd_done:
{
// Unlock must be called by the same thread that locked it.
if (yield_if_not(&gStateMachineThreadEngine))
{
break;
}
// Here we are running in gStateMachineThreadEngine.
...
2013-10-15 22:30:16 +02:00
Aleric Inglewood
9db6bc0557
Add AIStateMachine::mSMDebug
...
The patch is exclusively libcwd related.
Turns off output from statemachines to dc::statemachine by default.
Allows to turn on the debug output on a per statemachine basis (at
compile time).
2013-10-15 22:29:52 +02:00
Inusaito Sayori
9ea59b06d5
Fix crash signature 140
2013-10-15 08:58:32 -04:00
Latif Khalifa
897392f7e0
Don't log debug level info during shader loading
2013-10-15 07:23:23 +02:00
Latif Khalifa
7f52f78517
Breaking pad: restore 'Ask' preference for sending reports, cleanup remaining out-of-process bits
2013-10-15 07:20:57 +02:00
Latif Khalifa
bb7793283d
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-15 07:18:58 +02:00
Inusaito Sayori
43f25fed9b
[Warnings] Fix linux32 warnings again (missed some spots)
2013-10-14 19:42:08 -04:00
Shyotl
4da896682d
Fixed a couple obscure crashes.
2013-10-13 19:37:01 -05:00
Shyotl
6155e64086
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2013-10-13 19:27:03 -05:00
Shyotl
dbfd0cb7a6
Fixed a shutdown crash in LLAudioEngine::assetCallback, and fixed behavior when soundsource re-issues a sound whilst a sound is currently playing for same source. (LLAudioChannel[Impl]::play now re-starts sound if already playing)
2013-10-13 16:22:24 -05:00
Siana Gearz
19625ea6b8
MAINT-2968 disable client GL namegen, go spec
2013-10-13 17:07:45 +02:00
Andros Baphomet
e363aeb618
Merge remote-tracking branch 'upstream/master'
2013-10-12 21:23:07 -04:00
Latif Khalifa
aa077032b7
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-12 22:45:05 +02:00
Aleric Inglewood
1389bf76ce
Bug fix.
2013-10-12 22:36:27 +02:00
Latif Khalifa
f096f181f3
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-12 22:09:37 +02:00
Aleric Inglewood
1df09dec35
Remove assert that 100% reproducible fired - stopping me from logging in.
...
I wanted to fix the problem, but:
[21:45] <Aleric> Talking about dense - you guys want this to be fixed or not???
[21:45] <lkalif> no
2013-10-12 21:48:51 +02:00
Aleric Inglewood
8e0e532ea8
Merge remote-tracking branch 'singu/master'
2013-10-12 21:48:32 +02:00
Shyotl
daa07d031c
Fixed a couple of compilation errors when using GCC.
2013-10-12 12:13:58 -05:00
Andros Baphomet
ffb4abebdd
Merge remote-tracking branch 'upstream/master'
2013-10-12 12:59:26 -04:00
Latif Khalifa
cb12a35102
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llaudioengine.cpp
2013-10-12 10:04:05 +02:00
Latif Khalifa
e8c286308d
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-12 10:01:52 +02:00
Shyotl
7fb05e6a48
Audio engine changes:
...
-Idle tick is now responsible for dispatching all pending sound sources, as such improves priority sorting.
-Added ui sound precache mechanisms (to fetch sounds without associated soundsources)
-Audio engine no logner available pre-login or upon disconnect, for simplicity.
-General cleanup to the audio engine/impl.
-Fixed some gAudiop calls that were lacking prerequisite null checks.
-Added 'isUpstreamOK' procuedure to LLAssetStorage to allow avoidance of making requests when there is no upstream host connection.
2013-10-12 02:49:11 -05:00
Andros Baphomet
12abca8954
Merge remote-tracking branch 'upstream/master'
2013-10-12 01:50:26 -04:00
Aleric Inglewood
3b2393dbda
Merge remote-tracking branch 'singu/master'
2013-10-11 13:42:06 +02:00
Aleric Inglewood
0261eac2a4
Fix for crash report 1272
2013-10-11 13:35:32 +02:00
Latif Khalifa
69f273eb0e
Don't crash if pay floater is closed before reply arrives from the server
...
Fix from upstream
Potentially fixes http://crash.singularityviewer.org/crashes.php?stacktrace=processPayPriceReply
2013-10-11 13:14:59 +02:00
Inusaito Sayori
477daff92f
[Warnings] Fix linux32's "format ‘%lu’ expects type ‘long unsigned int’, but argument has type ‘size_t’"
2013-10-11 05:53:57 -04:00
Latif Khalifa
926e76adea
Dump the whole login response to the log file only in the debug builds
2013-10-11 10:12:35 +02:00
Inusaito Sayori
9429b875aa
Demote common "Splitting" warning to debugs
2013-10-11 04:06:38 -04:00
Inusaito Sayori
f268c26a3a
[LLIMMgr/LLIMPanel] Fix the crashes in notifyParticularFriendObservers()
...
Forgot to write this line amidst everything else, my bad.
2013-10-11 03:25:32 -04:00
Inusaito Sayori
aa86730df2
[LLIMMgr/LLIMPanel] Fix race condition between name lookup and title setting
2013-10-11 00:45:23 -04:00
Inusaito Sayori
80bb529220
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-10-10 22:16:39 -04:00
Damian Zhaoying
7cc99ebf72
update spanish messages in IM floaters
2013-10-10 23:15:33 -03:00
Inusaito Sayori
be5727548b
Fix a warning typo and a minor bug I thought I'd fixed long ago indicated by some getString warning spam
2013-10-10 20:25:15 -04:00
Inusaito Sayori
54c08b3ea0
Localize the new Silent Accept/Decline messages
2013-10-10 18:28:06 -04:00
Inusaito Sayori
8964cfd58b
[LLIMMgr/LLIMPanel Revision] Compile Fixies
...
How did these even
2013-10-10 17:01:18 -04:00
Latif Khalifa
cf214e4f9e
Silence compiler warnings
2013-10-10 22:07:43 +02:00
Latif Khalifa
2a830c3184
Merge branch 'master' of https://github.com/slabua/SingularityViewer
2013-10-10 21:58:25 +02:00
Latif Khalifa
c313d5fe28
Merge branch 'master' of https://github.com/AdeonWriter/SingularityViewer
2013-10-10 21:58:19 +02:00
Inusaito Sayori
390c097c6a
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-10-10 15:53:32 -04:00
Salvatore La Bua
ebc839d540
Rearrange silent keep/discard inventory offer buttons
2013-10-10 21:49:49 +02:00
Salvatore La Bua
20ee6cdb72
Add silent keep/discard inventory offer buttons
...
Adapted from Phoenix code
2013-10-10 20:21:46 +02:00
Inusaito Sayori
d503662b58
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-10-10 04:41:08 -04:00
Inusaito Sayori
91f6a4efa3
[OpenSim] Feature Request: Don't clamp max_import_scale to 240 on NonSL grids, and make max_import_scale start off based on the hippolimits' MaxPrimScale, not the SL-constant
2013-10-10 04:36:47 -04:00
Inusaito Sayori
13e25cfe6a
Feature Request: Add MiniMapPrimMaxAltitudeDelta and MiniMapPrimMaxAltitudeDeltaOwn to debug settings for users to configure how much altitude difference prims can have to be shown on the minimap
2013-10-10 04:29:12 -04:00
Inusaito Sayori
3fad577f2b
Fix spammy Texture WARNS to be DEBUGS as they should, also spellind fix
2013-10-10 04:22:48 -04:00
Inusaito Sayori
2f334b021f
[LLIMMgr/LLIMPanel Revision] Two last things
...
Handle display of popped out IM floaters better
send_start_session_messages(): cut early if ids is empty, fallback on UDP if there is a region but there isn't ChatSessionRequest Cap
2013-10-10 04:21:19 -04:00
Inusaito Sayori
363fa450fb
[LLIMMgr/LLIMPanel Revision] More Miscellaneous Code Cleanup
2013-10-10 04:18:08 -04:00
Inusaito Sayori
b049353178
[LLIMMgr/LLIMPanel Revision] Clean up construction of IM Floaters, so much redundant code!!
...
Removes mProfileButtonEnabled and lookupName()
2013-10-10 04:14:09 -04:00
Inusaito Sayori
0a874b0768
[LLIMMgr/LLIMPanel Revision] Don't let new messages ever change the active communications tab (perhaps fixes StockMaster's issue?)
2013-10-10 04:10:02 -04:00
Inusaito Sayori
a179f95057
[LLIMMgr/LLIMPanel Revision] Clean up ignored groups logic
2013-10-10 04:08:01 -04:00
Inusaito Sayori
402f4f7068
[LLIMMgr/LLIMPanel Revision] Feature Request: Friendship operations from IM
...
Also adds the toggle mute option, but this was deemed too risky and has been left commented out for future projects to decide for themselves on
2013-10-10 04:03:41 -04:00
Inusaito Sayori
42d9b425e9
[LLIMMgr/LLIMPanel Revision] Dynamic dropdown entries handling functions
...
Adds addDynamics(), removeDynamics(), rebuildDynamics()
2013-10-10 03:48:17 -04:00
Inusaito Sayori
d15ec04dba
[LLIMMgr/LLIMPanel Revision] Missed function declaration for closeIfNotPinned in a past commit, it's here
2013-10-10 03:40:15 -04:00
Inusaito Sayori
0cc5484b60
[LLIMMgr/LLIMPanel Revision] Add convert_roleplay_text() to centralize roleplay chat preprocessing
...
Unifies CAPSLock /ME handling
Unifies AutoCloseOOC impls so they share full common functionality
Adds AutoCloseOOC functionality to do /me ((autocompleted out of character action))
Also, RP Mode now uses parentheses rather than square brackets, by popular demand
2013-10-10 03:35:54 -04:00
Inusaito Sayori
d04820507c
[LLIMMgr/LLIMPanel Revision] LLFloaterIMPanel constructor combination and removal of LLFloaterIMPanel::init()
...
Also changes Session Label to Log Label because that's really what it is at this point
Also rearranges members in LLFloaterIMPanel, and war on BOOLs
Also removes mSessionInitialTargetIDs because it's no longer needed outside of the constructor
2013-10-10 03:26:51 -04:00
Inusaito Sayori
260723f2a4
[LLIMMgr/LLIMPanel Revision] Fix PinTalkViewOpen=false mechanics
...
If the user is holding a modifier key with enter, it bypasses the unpinned setting
If a chat is popped out, this setting now only minimizes that chat, not toggles the main communications floater.
LLIMPanel::closeIfNotPinned() now condenses the logic.
Also makes LLIMMgr::toggle() non-static and requiring no args.
2013-10-10 02:49:02 -04:00
Inusaito Sayori
9e312a3808
[LLIMMgr/LLIMPanel Revision] Cleanup of unused/useless classes, functions, members and xmls
2013-10-10 02:27:26 -04:00
Latif Khalifa
5f0b1ab05b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-10 05:17:41 +02:00
Shyotl
3132d2b0d0
Avoid perpetual re-entry for LLOctreeNode::octree_pool_alloc::malloc if LL_USE_TCMALLOC is defined.
2013-10-09 22:16:19 -05:00
Latif Khalifa
c3226b25fe
Fixed Windows build
2013-10-10 00:18:47 +02:00
Latif Khalifa
d98402b13f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvotree.h
2013-10-10 00:03:36 +02:00
Latif Khalifa
b2979ca3a4
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-10 00:01:56 +02:00
Shyotl
7a913af2c7
Use camera enums instead of magic numbers.
2013-10-09 16:09:09 -05:00
Shyotl
e324ffd9ad
In render_disconnected_background don't bind a shader or flush unless a disconnect image is actually being drawn.
2013-10-09 16:05:15 -05:00
Shyotl
e96caa78a1
Removed a little bit of unnecessary code from pipeline.cpp
2013-10-09 15:45:33 -05:00
Shyotl
b6bf5545c9
Change lightfunc from GL_R8 to GL_R16F/R32F
2013-10-09 15:44:15 -05:00
Shyotl
f25eb07fab
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00
Adeon Writer
9f6b89ff18
Don't shorten avatar skeleton while in mouselook
2013-10-08 18:17:51 -04:00
Damian Zhaoying
24463b7d04
update panel_login.xml and menu_minimap.xml files and fix labels in master language file menu-minimap.xml to make translations works
2013-10-08 17:49:52 -03:00
Aleric Inglewood
909be9e169
Add AITESTPLUGIN
...
Usage:
nc -l -p 61916
AITESTPLUGIN=1 LL_WRAPPER='gdb --args' ./singularity
Then paste into nc:
<llsd>
<map>
<key>class</key>
<string>internal</string>
<key>name</key>
<string>load_plugin</string>
<key>params</key>
<map>
<key>dir</key>
<string>/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/viewer-linux-x86_64-debug/newview/packaged/bin/llplugin</string>
<key>file</key>
<string>/opt/secondlife/viewers/singularity/SingularityViewer/linden/indra/viewer-linux-x86_64-debug/newview/packaged/bin/llplugin/libbasic_plugin_filepicker.so</string>
</map>
</map>
</llsd>
and press control-v control-shift-2
Where the path should match the library you want to load.
2013-10-08 15:34:22 +02:00
Drake Arconis
010723eea6
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2013-10-07 23:24:04 -04:00
Drake Arconis
a4fa66655e
Unbreak OSX Make File builds
2013-10-07 23:23:51 -04:00
Drake Arconis
610f7ac5de
Fix a Clang error
2013-10-07 23:23:40 -04:00
Adeon Writer
be10c2d7fb
Focus depth of field under cursor in flycam
2013-10-07 22:28:26 -04:00
Aleric Inglewood
e3ce473639
Compiler warning fix.
...
My guess is that this fixes the warning:
/singularity/singularity-master/indra/newview/llfloaterdirectory.cpp: In
function ‘void* createWebPanel(void*)’:
/singularity/singularity-master/indra/newview/llfloaterdirectory.cpp:167:
warning: ‘createWebPanel(void*)::LLPanelDirWeb’ declared with
greater visibility than the type of its field
‘createWebPanel(void*)::LLPanelDirWeb::<anonymous>’
/singularity/singularity-master/indra/newview/llfloaterdirectory.cpp:167:
warning: ‘createWebPanel(void*)::LLPanelDirWeb’ declared with
greater visibility than its base ‘LLPanelDirFind’
That I see in https://files.streamgrid.net/singularity/linux-i686.log
2013-10-08 02:06:28 +02:00
Drake Arconis
008eac5a8d
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2013-10-07 17:46:37 -04:00
Damian Zhaoying
08dd2f72ec
Merge remote-tracking branch 'Liru/master'
2013-10-07 14:22:25 -03:00
Latif Khalifa
c7ff14f224
Address issue #1128
2013-10-07 17:06:14 +02:00
Latif Khalifa
942f4ce225
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-07 16:59:20 +02:00
Latif Khalifa
7aed929af5
Attempted fix in Linux build and Linux32 packaging
2013-10-07 15:11:54 +02:00
Inusaito Sayori
99f81daa99
Feature Request: Add a debug setting, LiruLegacyLogLaunch, to use the old, non-browser method to open chat logs.
2013-10-07 05:43:56 -04:00
Drake Arconis
a1751dcc1e
Warning fix
2013-10-06 22:55:30 -04:00
Drake Arconis
817c01595f
I really really hate you microsoft. More windows sdk cmake poke
2013-10-06 22:55:21 -04:00
Drake Arconis
128503fd7f
Attempt to fix linking issues
2013-10-06 22:54:38 -04:00
Sean Devin
cf100fc36c
Do not use pcre on linux64
...
Conflicts:
indra/newview/viewer_manifest.py
Merged with a patch that I wrote.
The linux pcre prebuilts can also be removed from install.xml,
but for now leaving them there because the prebuilts are still
in use by the libcollada prebuilt (probably should just move
them into that git repository).
2013-10-06 21:56:11 +02:00
Aleric Inglewood
64513e7229
Fix boost upgrade for standalone
2013-10-06 19:42:58 +02:00
Aleric Inglewood
8262e899f8
Merge remote-tracking branch 'singu/master'
2013-10-06 17:11:58 +02:00
Latif Khalifa
a1c43e3539
Fixed mac build. How the heck did this get there?
2013-10-06 16:34:56 +02:00
Andros Baphomet
7ab20726e4
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
indra/llrender/llshadermgr.cpp (resolved)
2013-10-06 10:32:23 -04:00
Aleric Inglewood
f7614dced3
Fix possible problem with negative mQueuedCommands
...
mQueuedCommands was unsigned, but can become shortly negative.
Unfortunately this means I had to remove the assert that
keeps track of possible errors, but I believe that already
has been proven that it works anyway.
The reason it can become negative is because its meaning is
"Number of added ADD (request) commands minus number of REMOVE (request)
commands". Hence, it is incremented when an ADD command is added to the
queue and decremented when that ADD command is removed from the queue.
However, it is first decremented when a REMOVE command is added to the
queue and then incremented again when that REMOVE command is removed
again from the queue. Such a remove command is current extremely rare:
it only happens when curl fails to time out - and the backup timeout of
the statemachine fires after 10 minutes of a curl request being idle.
That should normally only happen if a request never reached curl of
course, and is queued in the curl thread, waiting to be added to curl,
aka: -0-0-1,{...} for 10 minutes...
Now that, in turn should be impossible (since the "don't count long poll
connections) unless the Curl* Debug Setting variables are changed to
wrong values.. but ok, can only guess here.
2013-10-06 15:27:40 +02:00
Aleric Inglewood
cfad646748
Removed left over debug output.
2013-10-06 11:54:11 +02:00
Latif Khalifa
85f4fa9000
Merge branch 'boost152'
2013-10-06 08:13:31 +02:00
Latif Khalifa
dd680f27d4
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-06 08:13:11 +02:00
Latif Khalifa
2c091a954f
Breaking pad: try to send the correct log file
2013-10-06 08:12:17 +02:00
Latif Khalifa
26f4c4a773
Boost throws exceptions
2013-10-06 08:11:07 +02:00
Latif Khalifa
ee007f322b
Rebuilt Collada with new boost from https://github.com/singularity-viewer/3p-colladadom/commits/singularity
2013-10-06 07:50:38 +02:00
Latif Khalifa
aece3c7069
Don't copy pcre on linux64
2013-10-06 07:49:38 +02:00
Latif Khalifa
9f0af64963
More boosted fun
2013-10-06 01:55:12 +02:00
Inusaito Sayori
337c0d9cbb
[Warnings] Remove warning suppressions for colladadom
...
I have fixed the warnings internally, so this wraps up my work
But our colladadom source and our prebuilds must be updated with my changes before this change is tolerable
2013-10-05 19:02:17 -04:00
Inusaito Sayori
4423bef896
[Warnings] Reduce collada includes to bare minimum to lessen Mac warnings
2013-10-05 18:33:07 -04:00
Inusaito Sayori
23e72f3978
[Warnings] Fix signed/unsigned mismatches rather than disabling 4018
2013-10-05 18:23:13 -04:00
Andros Baphomet
f6861cd5ba
Fix shader compilation/out-of-spec issues
2013-10-05 17:33:34 -04:00
Andros Baphomet
988009d84d
Don't explicitly set LIBGL_DRIVERS_PATH by default; breaks autodetection
2013-10-05 17:32:42 -04:00
Latif Khalifa
200b812182
Link boost statically
2013-10-05 22:09:54 +02:00
Latif Khalifa
4118afc146
Boost upgrade to 1.52
2013-10-05 20:27:20 +02:00
Aleric Inglewood
034ff0a305
Fix google breakpad for standalone.
...
The normal usage is to include the src/ directory of google breakpad
in your application and then include client/ARCH/handler/exception_handler.h
where ARCH is windows, mac or linux.
However, Linden Lab for some reason packaged the breakpad prebuilt
with exception_handler.h installed in ../google_breakpad/exception_handler.h
where "../google_breakpad" is the 'root' of the include tree comparable
with 'src' in the source tree of google breakpad.
Hence, instead of including 'src' one now must include '../include/google_breakpad'
which was already done correctly for non-standable, but not for
standalone (BREAKPAD_EXCEPTION_HANDLER_INCLUDE_DIR was set to '../include'
with the 'google_breakpad' and is subsequently never used: instead
BREAKPAD_INCLUDE_DIRECTORIES is used (which is set for non-standalone)).
Therefore one much not include "google_breakpad/exception_handler.h",
but just "exception_handler.h" or you rely on somehow the directory
*below* BREAKPAD_INCLUDE_DIRECTORIES to be part of the include path as
well.
Finally LL packages the prebuilt if another duplicate minidump_descriptor.h
in the include root. Also here including "minidump_descriptor.h" would
be better correct, but following the instructions by Google this time
we might as well include the original "client/linux/handler/minidump_descriptor.h".
My repo (http://github.com/AlericInglewood/3p-google-breakpad ) doesn't
even put minidump_descriptor.h in the root anymore, only
exception_handler.h. The rest is an exact copy of the 'src' tree with
regard to the headers.
Tested to compile both standalone and non-standalone.
2013-10-05 19:44:37 +02:00
Inusaito Sayori
eeeca2197e
Revert "Harden agains network packet overruns"
...
This reverts commit 6c1ea557b5 .
2013-10-05 04:31:57 -04:00
Inusaito Sayori
16a8b92d84
[OpenSimExtras] Added callback setters to for the new chat ranges
...
Though they're not in use yet.. they should be in use soon, either way should exist.
2013-10-05 03:39:59 -04:00
Inusaito Sayori
de1a459bcb
[OpenSimExtras] Variable chat ranges viewer awareness, thanks Diva Canto!!
2013-10-05 03:20:25 -04:00
Inusaito Sayori
7448ca1046
Bit of cleanup for simfeature handler
2013-10-05 03:04:58 -04:00
Inusaito Sayori
8f5337cc67
Tooltip for grids combo box to clarify its new uses for unfamiliar users
2013-10-04 21:01:02 -04:00
Inusaito Sayori
d7782383f1
Brokepad Mountain: Fix mac compiler warning by removing unused function and its unused static variable
2013-10-04 18:29:25 -04:00
Latif Khalifa
5f5943548b
Merge branch 'master', remote-tracking branch 'origin'
2013-10-04 23:06:24 +02:00
Latif Khalifa
4cd3291bd1
Merge branch 'master' of https://github.com/slabua/SingularityViewer
2013-10-04 23:05:52 +02:00
Latif Khalifa
d595eb3314
Breaking pad: link SLPlugin.app with the exacption handler
...
Fixes loading of SLPlugin on OS X
2013-10-04 23:00:48 +02:00
Inusaito Sayori
f770cb1a29
There's no such thing as ATI Geforce... this seems to have been added because of VWR-29593, but there's no such thing...
2013-10-04 04:43:14 -04:00
Inusaito Sayori
36d658c4c4
Feature Request: Make Log viewing cross platform by opening in a browser window
...
INB4 Windows users express discomfort.
2013-10-03 19:59:11 -04:00
Inusaito Sayori
cfeb50ae4d
Breaking pad: warning: 'OSStatus CarbonEventHandler(OpaqueEventHandlerCallRef*, OpaqueEventRef*, void*)' defined but not used
2013-10-03 13:46:16 -04:00
Inusaito Sayori
2b61394234
Fix /singularity/singularity-master/indra/plugins/filepicker/llfilepicker.cpp:762:61: warning: multi-character character constant
...
OSTypes are four byte sequences, therefore we should use 'JP2 ' instead of 'JP2'
2013-10-03 13:20:47 -04:00
Inusaito Sayori
1c96fa09fd
Fix a few signed unsigned mismatches
2013-10-03 12:41:10 -04:00
Damian Zhaoying
1c93ca6360
Merge remote-tracking branch 'Liru/master'
2013-10-03 12:44:11 -03:00
Salvatore La Bua
5183adbcaa
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-10-03 11:47:23 +02:00
Salvatore La Bua
6abffb2ce4
Merge branch 'master' of github.com:DamianZhaoying/SingularityViewer
2013-10-03 11:47:01 +02:00
Latif Khalifa
8bdc92c99b
Breaking pad: don't add special pre-copy files to build dir
2013-10-03 07:53:43 +02:00
Latif Khalifa
8da3e86250
Don't copy files unless we need to extract the debug symbols
2013-10-03 07:19:14 +02:00
Inusaito Sayori
f3df986647
Merge branch 'master' of https://github.com/abaph/SingularityViewer
2013-10-03 00:53:44 -04:00
Latif Khalifa
2a8b424b85
Merge branch 'breakpad3'
2013-10-03 06:38:41 +02:00
Latif Khalifa
7e02a5825e
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-03 06:37:57 +02:00
Latif Khalifa
c49907e5a4
Breaking pad: typofix
2013-10-03 06:20:14 +02:00
Latif Khalifa
60cd95b31f
Breaking pad: more cmake fun
2013-10-03 06:09:49 +02:00
Andros Baphomet
c39d66b547
Improved X log parser to handle VirtualGL systems, removed old X log parser
2013-10-02 21:35:17 -04:00
Inusaito Sayori
a5928f4dbf
Chatbar as cmdline, return false to avoid chatting certain commands
2013-10-02 20:34:20 -04:00
Latif Khalifa
9d4b978474
Breaking pad: Linux symbol dumping
2013-10-03 02:18:53 +02:00
Latif Khalifa
3447e9bd78
Brealpad: fixed symbol extraction on Mac
2013-10-03 00:26:54 +02:00
Latif Khalifa
a27dad4db0
Breakpad: added symbol extraction to the build.
...
Add -DRELEASE_CRASH_REPORTING:BOOL=ON to enable symbol extraction
on build time. Viewer without this set won't sent crash
reports to the crash server
2013-10-02 18:23:19 +02:00
Latif Khalifa
ba1b482025
Also repackage bin folder
2013-10-02 17:49:57 +02:00
Andros Baphomet
f6f9e5b802
Rewrote X log parser in VRAM detection code
2013-10-02 00:17:45 -04:00
Damian Zhaoying
d57dcd2a9c
Merge remote-tracking branch 'Liru/master'
2013-10-02 01:03:09 -03:00
Latif Khalifa
399a0038cb
Breakpad: now working Mac OS X
2013-10-02 04:14:58 +02:00
Latif Khalifa
c8cb600ba6
Breakpad: workaround for boost crash on Linux
2013-10-02 02:59:40 +02:00
Inusaito Sayori
a415b34c28
Fix a crash noticed while working on the last commit, when asserts aren't always, we should return before using null pointers.
2013-10-01 20:02:45 -04:00
Inusaito Sayori
ffd32542cc
[VarRegions] Prevent crashing on regions at the edge of reality itself (such as Null, Null)
...
Demotes "Asking for patch out of bounds" to llwarns to prevent crashies, guards against some seemingly potent cases.
2013-10-01 20:00:54 -04:00
Latif Khalifa
90e71db462
Breakpad: removed merge artifact, fixes Linux build
2013-10-02 01:26:27 +02:00
Latif Khalifa
b125ec8d51
Breakpad: untested update to linux/mac specific parts of llappviewer
2013-10-02 00:51:29 +02:00
Latif Khalifa
d20b7815df
Check user pref for sending logs
2013-10-02 00:39:11 +02:00
Latif Khalifa
98d7721ab2
Breakpad: Commence nuclear bombardment of the unused stuff
...
Windows breakpad crash reports implemented and uploaded
TODO: llappviewer linux and mac port of breakpad3
2013-10-01 23:41:38 +02:00
Latif Khalifa
81fa147450
Breakpad: don't fork logger process on startup. Use singularity-debug as the dir for dumps
2013-10-01 21:47:12 +02:00
Aleric Inglewood
9f50b6942e
Fix random crashes when opening HTTP debug console.
2013-10-01 18:49:53 +02:00
Latif Khalifa
c87f7b0576
Breakpad3: WIP, minidump files created
...
TODO: re-work sending crash logs
get rid of standalone loggers
2013-10-01 13:43:45 +02:00
Latif Khalifa
6c45bf0353
Breakpad3: Added linux64 prebuild thanks to Kokua
2013-10-01 06:18:08 +02:00
Latif Khalifa
428a3bafb8
Breakpad3: cmake and prebuilds
2013-10-01 06:04:17 +02:00
Salvatore La Bua
9233f873ef
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-10-01 03:39:00 +02:00
Salvatore La Bua
aa54d82c5a
Fix a render issue with Hightlight Transparent
...
The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.
2013-10-01 03:33:49 +02:00
Latif Khalifa
bc64e3aa29
Don't display both username and display name if they're the same.
...
This is issue especially on Aurora based grids.
Patch by Liru
2013-10-01 03:29:57 +02:00
Damian Zhaoying
db2fb32dd8
Merge remote-tracking branch 'Liru/master'
2013-09-30 21:42:46 -03:00
Damian Zhaoying
4f863689a9
update floater_tools.xml and other minor fixes
2013-09-30 21:40:37 -03:00
Salvatore La Bua
214ed0403d
Add toggle for RenderAnimateTrees in Advanced > Rendering
2013-10-01 02:08:59 +02:00
Latif Khalifa
e4202c361b
Don't skip transparent faces by default in Collada export
2013-09-30 23:35:51 +02:00
Latif Khalifa
b90512fea0
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-09-30 23:24:11 +02:00
Latif Khalifa
f7c19ed3fb
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-09-30 23:24:04 +02:00
Inusaito Sayori
77d52d0435
Correct git's var region merge botch, fixes dark streaks on terrain
2013-09-30 17:19:53 -04:00
Inusaito Sayori
2333a684a3
Feature Request: Allow typing login uris into the grids combo box on the login screen
...
Furthermore, users may now type in grid name, grid nick, or grid login uri into the box and it will resolve to an existing grid they've used before, or (for uris only) try to add the new grid with the data it provides.
Input will have trailing and leading spaces trimmed.
Thanks to Diva Canto for this brilliant request!
2013-09-30 17:18:41 -04:00
Salvatore La Bua
bed0ed73d9
Remove unused userdata fields from the MiniMap menu
2013-09-30 22:45:50 +02:00
Salvatore La Bua
c975339641
Fix copy/paste clumsiness in settings.xml
2013-09-30 22:36:08 +02:00
Salvatore La Bua
c0961e9760
Remove unnecessary listeners for the MiniMap
...
New class ToggleControl is used in place of the removed listeners.
Much cleaner code for the MiniMap chat rings.
Remove redundant debug setting: MiniMapChatRings.
-Thanks Liru for the advices.
2013-09-30 22:21:11 +02:00
Inusaito Sayori
705de655a9
Enable grids button portuguese translation
2013-09-30 14:42:02 -04:00
Aleric Inglewood
723f4963e0
Do not count long poll connections against CurlConcurrentConnectionsPerService
...
This is necessary for opensim mega regions that can have up to 16 long
poll connections for a single service, while upping the maximum number
of connections per service just for that is clearly nonsense.
I also changed that long poll connections do not "use" the "Other"
capability type (which shows that the debug info in the HTTP debug
console for the Other capability type turns grey when it only has event
poll connections). As a result additional connections become available
for textures, mesh and the inventory (the other capability types) on
opensim, which has all types on the same service, because now Other
does no longer constantly reserves a full share of the available
connections. This makes the actual number of connections used for
textures and mesh a lot more like it is on Second Life.
2013-09-30 17:39:17 +02:00
Salvatore La Bua
ddae988aa5
Minor change in class listing order in llnetmap.h
2013-09-30 12:27:33 +02:00
Inusaito Sayori
979d139af1
Address Issue 352: Ctrl-Backspace in editable text fields
2013-09-29 19:14:56 -04:00
Inusaito Sayori
ca84e68da0
Bug fix? Prevent squares showing up on windows by only using spaces in keywords.ini
...
There were, and may still be, squares showing up in some tooltips in script editor... this in effort to prevent them
2013-09-29 13:33:44 -04:00
Latif Khalifa
5817040956
Merge branch 'master' of https://github.com/slabua/SingularityViewer
2013-09-29 17:34:55 +02:00
Salvatore La Bua
8f9de319bf
Use correct matrixMode to draw chat rings, thanks LightDrake
2013-09-29 17:31:17 +02:00
Inusaito Sayori
aa14bcc754
[VarRegions] Permanently guard against Issue 1125 sneaking back in, as best we can.
2013-09-29 11:14:57 -04:00
Inusaito Sayori
da0a092d42
[VarRegions] Fix Issue 1125: Chat Window Links open up browser
2013-09-29 11:14:00 -04:00
Aleric Inglewood
227c621dad
Merge remote-tracking branch 'slb/master'
...
Conflicts:
indra/newview/llnetmap.cpp
indra/newview/llnetmap.h
indra/newview/skins/default/xui/en-us/menu_mini_map.xml
2013-09-29 16:56:55 +02:00
Sean Devin
ffc44a7010
Implemented right click option on MiniMap to hide or show objects
2013-09-29 15:56:38 +02:00
Salvatore La Bua
af1480615f
Add optional chat ranges rings on MiniMap
...
Ability to show Whisper, Chat and Shout range circles on the MiniMap.
Range values are at the moment hardcoded as [10, 20, 100].
Each ring is binded to the following Debug Settings:
Whisper ring: MiniMapWhisperRing
Chat Ring: MiniMapChatRing
Shout Ring: MiniMapShoutRing
Each ring colour can be customised through the following Debug Settings:
Whisper ring: MiniMapWhisperRingColor
Chat Ring: MiniMapChatRingColor
Shout Ring: MiniMapShoutRingColor
The following Debug Setting is used to enable/disable all the rings at once:
MiniMapChatRings
2013-09-29 14:53:51 +02:00
Salvatore La Bua
6b26561605
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-09-29 02:06:32 +02:00
Latif Khalifa
1e7f984ce6
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-09-29 01:34:00 +02:00
Aleric Inglewood
1ef90525b7
Add support for GetMesh2
...
Tested that it's actually being used - and it seems to download
everything at high speed. Certainly an improvement.
Textures are still *requested* in the wrong order though; for
example - baked textures are simply not requested for a long time -
while they are even downloaded from another service!
2013-09-29 01:00:30 +02:00
Salvatore La Bua
aa4bee448d
Remove unnecessary CommitCallback
2013-09-29 00:01:11 +02:00
Aleric Inglewood
1c0f87d82f
Let curl follow redirects by default.
...
Turns out that the only responders that want to get the redirect
status codes themselves are the ones that already had a
redirect_status_ok() exception.
2013-09-28 20:41:10 +02:00
Inusaito Sayori
af36d63975
Remove duplicate entries from message_prehash.h
2013-09-28 11:34:57 -04:00
Aleric Inglewood
243b499b95
Merge remote-tracking branch 'singu/master'
2013-09-28 16:52:37 +02:00
Latif Khalifa
b5ba5b8d3a
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-09-28 16:23:28 +02:00
Salvatore La Bua
b4cdd2c175
Enable Client tags on a new line by default
...
Change default value for SLBDisplayClientTagOnNewLine to 1
2013-09-28 16:18:52 +02:00
Salvatore La Bua
792cc12ebc
Comment out an unused variable e_state_name[] in lltexturefetch.cpp
2013-09-28 05:38:09 +02:00
Salvatore La Bua
df7c60de35
Add option to show Client tags on a new line
...
The checkbox is available in Preferences > Vanity > Tags/Colors.
Debug Setting: SLBDisplayClientTagOnNewLine
2013-09-28 05:32:54 +02:00
Salvatore La Bua
afe0f7ef3d
Revert "Trees shadow parameters use actual debug settings"
...
This reverts commit 3c5a0efb8d .
2013-09-28 05:15:45 +02:00
Inusaito Sayori
da38d4bc48
[VarRegions] Fix copy slurl on map to take the fmod of the x and y against the width of the region in question, instead of 256
2013-09-27 13:41:45 -04:00
Inusaito Sayori
fe29521298
[VarRegions] Made the radar aware that region width may not be 256 always anymore
2013-09-27 11:58:03 -04:00
Inusaito Sayori
4725db2d2f
Merge branch 'VarRegion' of https://github.com/Lirusaito/SingularityViewer into aurora-sim
...
Merged cleanly:
indra/llkeyframewalkmotion.cpp - 36e6946c96 - worked around a bug in Aurora walking motion
indra/llrender/llimagegl.cpp - fa8e1f033b - An llerrs here becomes an llwarns, to avoid bothering the user with non power of two dimensioned images
indra/newview/llmanip.cpp, indra/newview/llmanipscale.cpp - "Changed hardcoded 256 constants and such to width functions" - a50f0008b2
indra/newview/llpatchvertexarray.cpp - fa8e1f033b - Support patches of non power of two width
indra/newview/llworldmap.h - conflict
Conflicts:
indra/llmessage/patch_code.cpp - My version cleaned up a bit of code duplication, so this was applied, within the new tags
indra/llmessage/patch_code.h - b_large_patch in decode_patch_header defaults to false, indra/newview/llcloud.cpp patch removed.
indra/llmessage/patch_dct.h - false positive
indra/newview/llagent.cpp - false positive
indra/newview/llfloaterregioninfo.cpp - nonsl wacky textures support meets the refactor.
indra/newview/llfloaterworldmap.cpp - false positive
indra/newview/llglsandbox.cpp - false positive
indra/newview/llnetmap.cpp - small changes for type consistency brought into FS' patch, nothing important; also adds change to LLNetMap:draw removing getRegionWidthInMeters to keep using the constant REGION_WIDTH
indra/newview/llpanelobject.cpp - Get the region width of the object we're editing for maximum pasted x/y coords
indra/newview/llstartup.cpp - [Fixes old issues] My old patch did not fully use first_sim_size_x here, this has been fixed. The unused first_sim_size_y has been removed.
indra/newview/llsurface.cpp - rebuildWater isn't used, removed for now. Styling conflicts otherwise.
indra/newview/llsurfacepatch.cpp - remove FS patch that comments out code that isn't even in the modern source; cleaned up a mess of tags with more clear explanation, perhaps it can be expanded upon though. Some styling conflicts.
indra/newview/llviewermessage.cpp - Fix the problem? setRegionWidth by number.
indra/newview/llviewerobject.cpp - false positive
indra/newview/llviewerparcelmgr.cpp - just styling conflicts
indra/newview/llviewerparcelmgr.h - false positive
indra/newview/llviewerparceloverlay.cpp - false positive
indra/newview/llviewerparceloverlay.h - false positive
indra/newview/llviewerregion.cpp - cleaned up LLViewerRegion::getCompositionXY patches, they're more in the way than they're worth; removed DispatchOpenRegionSettings capability mention for now, it's not related to variable regions. Also remove rebuildWater, it's not used right now.
indra/newview/llvowater.cpp - false positive
indra/newview/llwind.cpp - remove decode_patch_header patches for false, since we have a default; otherwise false positive.
indra/newview/llworld.*
- [Fixes old issues] Remove setRegionWidth by LLMessageSystem as the messages used are not always the same, the by number one remains of course.
- Retained separation of connecting neighbors through the old method when the width is 256
- updateLimits() would never have been merged in, we have an entirely different grid manager, therefore it's removed.
- Fix the stupidity passed on over the years wherein a static constant variable would hold the same value as the first call to setLandFarClip..
indra/newview/llworldmap.cpp - 36e6946c96 Aurora map workaround stuffs, parts removed; rework of LLWorldMap::simInfoFromHandle
indra/newview/llworldmap.h - Cleaned up organization, avoid making members public, and fixed tagging
2013-09-27 09:51:39 -04:00
Latif Khalifa
d08c34cc2e
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-09-27 03:22:26 +02:00
Latif Khalifa
ad8ea07a7a
Aurora var region support
...
Firestorm patch by Cinders
Adopted from Angstrom viewer with assistance of nhede Core
and Revolution Smythe.
2013-09-27 03:14:51 +02:00
Inusaito Sayori
2cc1658eda
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-09-26 04:39:55 -04:00
Inusaito Sayori
e58180a59e
Revert "Revert OCD commit tick."
...
This reverts commit 7346931f7f .
2013-09-26 04:34:55 -04:00
Inusaito Sayori
0a67fa3520
Satisfy Issue 1115: Make clock on top status line toggleable
...
Click the clock to change from server time to local~
2013-09-26 04:34:17 -04:00
Latif Khalifa
6c1ea557b5
Harden agains network packet overruns
...
Patch by NickyD from Firestorm
2013-09-26 04:09:01 +02:00
Latif Khalifa
3066dcac58
Merge branch 'master' of https://github.com/slabua/SingularityViewer
2013-09-26 02:45:48 +02:00
Inusaito Sayori
34738593eb
Allow species selection for plant creation
...
Fixes hardcoded "Random" string for translation of this new combobox.
2013-09-25 17:04:44 -04:00
Damian Zhaoying
0eba360416
update spanish language file floater_dae_export.xml
2013-09-25 13:30:03 -03:00
Damian Zhaoying
116a4048b7
Merge remote-tracking branch 'Liru/master'
2013-09-24 04:14:07 -03:00
Salvatore La Bua
2bc9b8a1b9
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-09-24 01:43:28 +02:00
Latif Khalifa
18859e44c7
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-09-24 01:39:58 +02:00
Shyotl
b473661cf4
ilu gcc (fix preprocessor macro typo that VS thought was dandy for some reason.)
2013-09-23 18:38:48 -05:00
Salvatore La Bua
dad4f4f9a0
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-09-24 01:20:35 +02:00
Latif Khalifa
7263b87e62
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-09-24 00:57:47 +02:00
Shyotl
3fcc92ccad
FOLDERID_LocalAppData should have been FOLDERID_RoamingAppData
2013-09-23 17:55:32 -05:00
Latif Khalifa
c06c909700
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-09-24 00:26:35 +02:00
Shyotl
c47f6405d2
Texfetch/cache changes:
...
Added SEND_UDP_REQ and WAIT_UDP_REQ fetch states.
Parse 'content-range' from headers.
Purge 'complete' textures from the cache if they lack 'end of codestream' marker.
Added boostlevel/category to textureview display.
More diagnostic output.
Discard handling tweaks/bugfixes from v3.
2013-09-23 17:19:44 -05:00
Shyotl
55f43c5fcd
Missed a SHGetSpecialFolderPath call.
2013-09-23 16:16:18 -05:00
Salvatore La Bua
3c5a0efb8d
Trees shadow parameters use actual debug settings
...
Use RenderDeferredTreeShadowOffset, RenderDeferredTreeShadowBias,
RenderDeferredSpotShadowOffset and RenderDeferredSpotShadowBias
in place of hard coded values.
2013-09-23 22:34:41 +02:00
Aleric Inglewood
c448908200
Merge remote-tracking branch 'singu/master'
2013-09-23 20:24:33 +02:00
Inusaito Sayori
13077bc132
Fix group search's copy uri button copying the link for a personal group always.. Thanks to Malakina Gummibaum for pointing this out~
2013-09-23 14:07:14 -04:00
Aleric Inglewood
f0c7dadfa6
Fix crash when previewing an animation.
...
When uploading an animation, playing the to-be-uploaded
animation on ones own avatar while ground sitting would
crash the viewer.
This fixes that, and makes the avatar cleanly stand up first.
Rationale: the alternative is to make the user learn by
means of crashing, being frozen or just not seeing the right
animation that they have to stand before uploading an animation.
There is no reason not to automate that.
2013-09-23 20:05:56 +02:00
Latif Khalifa
b6dfea6e5f
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2013-09-23 01:56:29 +02:00
Aleric Inglewood
5df5074090
Merge remote-tracking branch 'singu/master'
2013-09-23 01:43:52 +02:00
Aleric Inglewood
e3939c3632
Avoid long viewer freezes when region doesn't have reverse DNS.
...
Some opensim servers might not have a reverse DNS, which causes
a stall of up to 5 seconds for each call. This means that
every time you up the parcel music stream (or any other media)
the viewer would freeze six times 5 seconds.. 30 seconds.
With this patch it only freeze once ;) (when you enter a region).
It already did that before (too), but after that opening the
parcel media doesn't freeze the viewer at all anymore.
2013-09-23 01:41:11 +02:00
Aleric Inglewood
12d3873aa7
Crash fix for empty media URL.
...
Apparently LLViewerMediaImpl::navigateInternal could be called with
an empty url. That lead to a curl request with an empty url, which
failed because that leads to an empty 'service' string, which is
not allowed.
Patched the code to ignore empty media urls and hardened AICurl
to deal with any remaining cases.
2013-09-22 23:25:40 +02:00
Salvatore La Bua
083d569e35
Reverted Objects LOD slider max value to 2 and fixed presets values for the Trees LOD slider according to the new maximum
2013-09-22 22:33:09 +02:00
Salvatore La Bua
da942d4968
Increased in Preferences > Graphics the maximum value for the Objects LOD slider from 2 to 4 and for the Trees LOD slider from 1 to 2
2013-09-22 19:13:21 +02:00
Drake Arconis
681f10d8b7
Make ubuntu cmake hack do yes up go now
2013-09-22 12:33:10 -04:00
Salvatore La Bua
4db8234da5
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-09-22 06:24:06 +02:00
Salvatore La Bua
da4196c246
Re-enabled RenderAnimateTrees. Fixes issue 1101: http://goo.gl/YIvqSY
2013-09-22 05:52:35 +02:00
Latif Khalifa
67142f3080
Merge branch 'master' of https://github.com/slabua/SingularityViewer
2013-09-22 02:04:52 +02:00
Salvatore La Bua
67720c6a6a
Fixed position of ui element Show FPS to the bottom right corner
2013-09-22 01:14:47 +02:00
Salvatore La Bua
df6aa397f9
Added a menu toggle item at Advanced > UI > Show FPS to show fps as an ui element. The related Debug Setting is: SLBShowFPS
2013-09-22 00:11:54 +02:00
Latif Khalifa
791b64f74b
Merge branch 'patch-1' of https://github.com/aragornarda/SingularityViewer
2013-09-21 18:37:55 +02:00
Latif Khalifa
f4f888c172
Potential fix for a crash on HG OpenSim teleports by Liru
2013-09-21 18:22:59 +02:00
Damian Zhaoying
68aa60595e
update string.xml file for user status in panel avatar
2013-09-20 16:17:01 -03:00
Damian Zhaoying
2ec2b92bc5
Merge remote-tracking branch 'Liru/master'
2013-09-20 14:19:58 -03:00
Latif Khalifa
992d8e960c
Copypasta typo fix. Spotted by Cinder Biscuits
2013-09-20 13:51:38 +02:00
Latif Khalifa
9f48485b9c
Strip newline chars from the end of the log line string
2013-09-20 13:34:17 +02:00
Inusaito Sayori
e9ca27322b
Run trim on input start locations, in case copy paste brought some spaces along for the ride
2013-09-19 23:40:14 -04:00
Inusaito Sayori
104099aed5
[Issue 1105] Fix Last Login row in groups not sorting properly
...
Updated llgroupmgr.cpp's formatDateString() from upstream
-Corrected it to actually use ISO 8601 format.
Also fixes notices tab to use the new format parameter to sort properly.
2013-09-19 23:37:58 -04:00
Inusaito Sayori
892d224b9c
[Issue 1105] Add Parameter "format" to scroll list cells to define how a date cell will format its displayed date
...
Defaults to use RFC1123 to maintain expected behavior
2013-09-19 23:29:36 -04:00
Latif Khalifa
ae38835959
Version 1.8.3
2013-09-18 06:55:30 +02:00
Damian Zhaoying
fb88ad737f
Merge remote-tracking branch 'Liru/master'
2013-09-17 23:43:37 -03:00
Inusaito Sayori
a4c0cab6a0
Fix 1098 (caused by silly mistake in filepicker bit for windows)
2013-09-17 18:32:54 -04:00
Latif Khalifa
dd1cb4921f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-09-17 21:41:58 +02:00
Aleric Inglewood
9ac7a139af
Rewrite of LLLogChat::loadHistory.
...
Tested to work.
2013-09-17 21:41:49 +02:00
Damian Zhaoying
652e498cc5
added new floater_dae_export.xml translation file and other minor changes
2013-09-17 03:16:05 -03:00
Drake Arconis
eeeaaa3535
Translation poking for my last commit
2013-09-17 01:58:48 -04:00
Drake Arconis
08654cc859
Fixed profile floater not displaying custom account type strings from server
2013-09-17 01:31:54 -04:00
Damian Zhaoying
2f2d140be5
Merge remote-tracking branch 'Liru/master'
2013-09-17 00:30:42 -03:00
Latif Khalifa
3f1d05b839
Re-apply warning fix after the previous revert
2013-09-17 05:04:44 +02:00
Latif Khalifa
7346931f7f
Revert OCD commit tick.
...
Revert "Appease VS2010 warning and make ui code more consistent with the modern standard in daeexport.cpp"
This reverts commit cb6dec62ec .
2013-09-17 04:59:25 +02:00
Inusaito Sayori
132574f53c
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-09-16 22:46:32 -04:00
Inusaito Sayori
37c2bb0a6e
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2013-09-16 22:46:21 -04:00
Inusaito Sayori
9b33e592fa
Fix log being read from the top, woops
2013-09-16 22:44:31 -04:00
Inusaito Sayori
69a6968775
Request: Add menu item separator between replace and remove.
2013-09-16 22:36:48 -04:00
Latif Khalifa
afec67e596
Kill a compiler warning
2013-09-17 01:48:39 +02:00
Latif Khalifa
97c8218463
Don't crash when chanelp returned is null
2013-09-17 01:48:11 +02:00
Inusaito Sayori
f73caef7a5
Fix log timestamp inconsistency when including seconds
2013-09-16 14:31:58 -04:00
Damian Zhaoying
d16e93f62f
Merge remote-tracking branch 'Liru/master'
2013-09-16 13:28:04 -03:00
Inusaito Sayori
cb6dec62ec
Appease VS2010 warning and make ui code more consistent with the modern standard in daeexport.cpp
2013-09-15 18:01:21 -04:00
Latif Khalifa
a2b2af6eb7
Don't pass std::string to llformat
2013-09-15 10:40:16 +02:00
Latif Khalifa
a5aedfb783
Typo fix
2013-09-15 10:29:52 +02:00
Latif Khalifa
b4697bf732
Made texture export on by default when exporting Collada.
2013-09-15 09:26:49 +02:00
Latif Khalifa
b2ae9feda0
Collada export, now with more awesome
...
* Added support for exporting textures
* Added support for applying texture parameters
* Added support for merging faces with same textures
* Added support for skipping transparent faces
2013-09-15 09:19:21 +02:00
Latif Khalifa
0de1e27470
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-09-15 09:14:23 +02:00
Inusaito Sayori
e5f2d5f76e
Fix Save Preview As... for textures, now save as any type we can encode to!
...
Removes the previous method and condenses the menu entries back into one.
- Translations have been updated except for German, German will need to update the translation for "Save Preview As..." since the name hasn't changed.
Adds FFSAVE_IMAGE to the filepicker enums
Crossplatformity:
- The Windows version works nicely
- The Linux version may not work or even compile but it should..
- The Mac version hasn't been added, instead it will default to accept any(all filter), should the provided file extension be invalid a notification will display.
2013-09-14 21:21:36 -04:00
Inusaito Sayori
42f8875d69
Group chat seems to want script reset from object inventory, so here you go.
2013-09-14 21:07:01 -04:00
Inusaito Sayori
0d1c4def2d
Feature Request: Add a debug setting to prevent double clicking on the world map resulting in a teleport
...
Adds DoubleClickTeleportMap to debug settings.
2013-09-14 20:59:12 -04:00
Inusaito Sayori
0b20babd35
Feature Request: Add a debug setting for how many lines of history to show when LogShowHistory
...
LogShowHistoryLines is the setting
This change cleans up some very C code in lllogchat.cpp
2013-09-14 20:55:19 -04:00
Inusaito Sayori
9b984d425d
Feature Request: Add an option to show the grid name in title
...
LiruGridInTitle is the debug
2013-09-14 20:51:03 -04:00
Inusaito Sayori
461f6f6ade
Since views cleanup their children, drop target's destructor doesn't need to.
2013-09-13 19:08:52 -04:00
Damian Zhaoying
701d8ba37b
fix typo and update text for new option in avatar menu
2013-09-13 14:16:49 -03:00
Aleric Inglewood
dcbcc7ea3c
Avoid compile error when using glh and boost at the same time.
...
Defining a macro in a header that doesn't have any namespace prefix
like GLH_ ugh. Very bad.
Changed the macro into an inline function inside namespace glh.
2013-09-13 17:22:56 +02:00
Inusaito Sayori
a0a51fb762
Max prim scale on opensim is now 8192 (server restrictions may apply, limit one per customer)
2013-09-12 22:35:31 -04:00
Inusaito Sayori
5058e3e87d
Don't changeCameraToDefault when notecards open.
2013-09-12 18:44:30 -04:00
Inusaito Sayori
c6e2559d3e
Correct a typo in setting name for preferences panel
2013-09-12 17:11:26 -04:00
Latif Khalifa
c14d46074c
Re initiate spatial partitions in the main region after a long teleport jump.
...
Also kill objects in the regions we left behind.
Restore max octree range to 1024 * 1024
2013-09-12 09:42:55 +02:00
Inusaito Sayori
5b73586b95
Display the current region's grid coordinates in Help->About Singularity
2013-09-12 00:42:03 -04:00
Latif Khalifa
5573499b9d
Reduce max size of octree root to 2048^2 in an attempt to avoid float errors leading to crashes on very long teleports
2013-09-12 03:09:51 +02:00
Inusaito Sayori
5575ff2b90
Default all available items to be included in new outfits
2013-09-11 18:54:27 -04:00
Latif Khalifa
3d6b94d2ed
Avoid infinite recursion crashes with wider octree range
2013-09-11 23:28:26 +02:00
Inusaito Sayori
312a58584e
Fix some cases where busy and muted were not evaluated properly for automated handling of incoming messages
2013-09-11 15:38:35 -04:00
Latif Khalifa
170d9c7983
Made max octree range power of two.
...
Fixes crashes observed in "Forum" region in SL where some
avatars seem to be flying millions of meters up in the air.
2013-09-11 19:58:02 +02:00
Inusaito Sayori
9786bc47fb
Clear out comment text when saving to solve Issue 1078
...
Thanks to Zi Ree for this fix
2013-09-11 03:11:10 -04:00
Latif Khalifa
3045f93f62
Increased octree limit to 32k. Addresses "4096 bug" in Opensim
...
Thanks to NickyD for tracking down the cause.
Refereces:
https://jira.secondlife.com/browse/SVC-2941
http://redmine.kokuaviewer.org/issues/465
http://jira.phoenixviewer.com/browse/FIRE-11593
2013-09-10 19:19:05 +02:00
Latif Khalifa
56af88fb94
Revert "Removed internal limit 2^20 for lloctree"
...
This reverts commit 7376c833c7 .
2013-09-10 19:16:02 +02:00
Latif Khalifa
7376c833c7
Removed internal limit 2^20 for lloctree
...
This addresses "4096 bug" affecting long Opensim teleports
Patch by NickyD (Firestorm)
Refereces:
https://jira.secondlife.com/browse/SVC-2941
http://redmine.kokuaviewer.org/issues/465
http://jira.phoenixviewer.com/browse/FIRE-11593
2013-09-10 13:22:01 +02:00
Latif Khalifa
0d893c5217
Revert "Possible fix for "4096 bug" affecting long Opensim teleports"
...
This reverts commit f7cf69ec95 .
2013-09-10 13:02:38 +02:00
Latif Khalifa
8a69b9e50d
Revert "Patch tool completely misplaced a hunk in previous commit"
...
This reverts commit 99893ee992 .
2013-09-10 13:02:17 +02:00
Latif Khalifa
99893ee992
Patch tool completely misplaced a hunk in previous commit
2013-09-10 04:19:01 +02:00
Latif Khalifa
f7cf69ec95
Possible fix for "4096 bug" affecting long Opensim teleports
...
Patch by Tonya Souther (Firestorm)
Refereces:
https://jira.secondlife.com/browse/SVC-2941
http://redmine.kokuaviewer.org/issues/465
http://jira.phoenixviewer.com/browse/FIRE-11593
2013-09-10 03:53:03 +02:00
Inusaito Sayori
27b2f14193
Fix for STORM-1948; modified version of viewer-release's 683b1ecc6ce8255d31cad3c674ffaf87353c6469
...
To maintain compatibility with grids that still use the old home position set notification method, a common function is called.
The fix has also been applied for the special case of death teleports.
2013-09-09 21:27:33 -04:00
Inusaito Sayori
e36c0095e0
Add NewIMsPerConversationReset to reset the visibility of the New IMs button when the communicate floater has been opened and closed and NewIMsPerConversation is in use
...
(this is now the default behavior of NewIMsPerConversation)
2013-09-09 21:08:38 -04:00
Inusaito Sayori
0b1a172a91
Fix up spanish translation for the IM flyout button
2013-09-09 21:03:41 -04:00
Inusaito Sayori
b5cc29ebbc
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-09-09 20:56:07 -04:00
Inusaito Sayori
88af3cabc3
Fix the issue of system messages being counted towards unread IMs
2013-09-09 20:55:21 -04:00
Latif Khalifa
f838c235cb
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-09-09 10:24:29 +02:00
Inusaito Sayori
0e5085e6bc
Fix owner mask being displayed in the debug permissions for everyone mask
2013-09-08 10:50:16 -04:00
Inusaito Sayori
380642044f
Revert "Mewmew"
...
This reverts commit 27dcbef8fa .
2013-09-06 15:42:14 -04:00
Inusaito Sayori
22fee625e5
Revert "You, my friend, are a victim of disorganized thinking."
...
This reverts commit d956f60c0b .
2013-09-06 15:39:00 -04:00
Damian Zhaoying
7d4c633514
Update changes in floater IMs
2013-09-02 18:12:31 -03:00
Latif Khalifa
c7d5ef31c0
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-09-01 02:26:05 +02:00
Aleric Inglewood
fc70dd436f
Fix of issue 1055
...
Thanks to sappadillidallagio and warctor/Parker for reporting.
2013-08-31 22:56:37 +02:00
Inusaito Sayori
d9bff43dd8
At the Singularity group's request: Another attempt to mute voice upon reconnecting to local voice if the setting requests such
2013-08-29 14:05:24 -04:00
Inusaito Sayori
50a85109a0
Improvements to NewIMsPerConversation mechaics and includes cleanup in lloverlaybar.cpp
2013-08-29 14:01:23 -04:00
Inusaito Sayori
adeb340e93
Includes cleanup in llimpanel.* and llimview.cpp
2013-08-29 13:57:54 -04:00
Inusaito Sayori
539eb2e348
Add buttons back to the IM floater, taking the space that RP Mode once occupied
...
Also fix concise IM buttons from looking awful, concise stays concise, only the dropdown button there.
2013-08-29 13:56:14 -04:00
Inusaito Sayori
b3f414c4ad
Move RP Mode check into the Profile button dropdown
2013-08-29 13:45:24 -04:00
Inusaito Sayori
83c66c978b
Option to ding on each new IM for given private IM sessions
...
Ding noises configurable via LiruNewMessageSound* debug settings
2013-08-29 13:35:35 -04:00
Inusaito Sayori
344909c0a3
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-08-28 03:38:02 -04:00
Damian Zhaoying
ce1c554fa3
Spanish Translation. Added new option in voice control panel. Added new option web profile in calling card options in menu inventory
2013-08-28 04:34:08 -03:00
Inusaito Sayori
e032c53bc6
Feature Request: Make the map dot color for everyone else customizable
...
Switches MapAvatar from being part of a skin's colors.xml to being a user setting (optionally vanity per account)
This makes sense because all the other dots were at the user's control already.
2013-08-28 03:29:57 -04:00
Inusaito Sayori
e08c05fbd6
Feature Request: Add debug setting ResetViewTurnsAvatar to solve the problem described in Issue 715 Comment 10
...
Solves https://jira.secondlife.com/browse/VWR-27956
2013-08-28 01:12:03 -04:00
Latif Khalifa
64c6a8a3ed
Bump version to 1.8.2
2013-08-28 06:44:35 +02:00
Inusaito Sayori
c57191b951
Feature Request: Ability to have the New IMs button display the amount of unread conversations instead of the amount of new IMs therein
...
Set NewIMsPerConversation true to activate.
2013-08-28 00:35:31 -04:00
Inusaito Sayori
9c80f58d34
Fix tabs and spaces mixup and typo in llvoicevivox.
2013-08-27 23:27:09 -04:00
Inusaito Sayori
e571b9a585
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2013-08-27 23:18:45 -04:00
Inusaito Sayori
9df7808dc8
Add Web Profile option to calling card inventory menu
...
Only shown when web profiles are available and web profiles aren't used by default
2013-08-27 21:37:08 -04:00
Latif Khalifa
27480c1718
Issue #1049 , additional checks for sculpt prims
2013-08-27 21:21:12 +02:00
Inusaito Sayori
01e31cc711
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-08-27 10:04:40 -04:00
Latif Khalifa
bd8a44ad21
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-08-27 15:19:36 +02:00
Latif Khalifa
8ff867e792
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-08-27 14:47:50 +02:00
Damian Zhaoying
302d9e1e50
Update notifications.xml and other files and add new file floater_inv_panel.xml
2013-08-26 17:51:51 -03:00
Inusaito Sayori
67180f40fc
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2013-08-25 14:24:56 -04:00
Drake Arconis
fdc855cd37
Trivial changes to better sync with viewer 3
2013-08-25 14:14:51 -04:00
Drake Arconis
cdeea281cd
Fix debugging info left on from win8 fixes
2013-08-25 03:04:47 -04:00
Drake Arconis
4ec56904e7
Make perlin nosie repeatable for consistent ground textures
2013-08-25 03:02:59 -04:00
Drake Arconis
01bba31c8d
Crash fixes to deal with janky FBX to DAE converters
2013-08-25 03:02:40 -04:00
Drake Arconis
5968708207
Fixed non-localizable strings in world map
2013-08-25 02:45:00 -04:00
Drake Arconis
5bf7281525
Fixes to build against windows 8 sdk
2013-08-25 02:16:35 -04:00
Inusaito Sayori
a2b0731dd0
Satisfy Issue 613: TIme-stamp when viewing old notices in groups
...
To activate set LiruGroupNoticeTimes to true via debug settings
Depending on your date and time settings, you may need to resize the date column of the scroll list and hit refresh to see the times, alternatively, the tooltips will display the whole time always.
2013-08-24 21:57:42 -04:00
Inusaito Sayori
c9482ecac5
Feature request: Add an option to open inventory folders in a new separate window
2013-08-24 21:52:53 -04:00
Inusaito Sayori
c3b7c6999f
Implemented decrement and distance_to for LLInstanceTracker::instance_iter and LLInstanceTracker::key_iter
...
Technically, both nested iterator classes in llinstance tracker should be derived from a common base implementation of boost::iterator_facade for std::maps(LLInstanceTracker::InstanceMap), they'd only need to implement dereference individually
2013-08-24 21:49:01 -04:00
Inusaito Sayori
323adeb224
Increment unread message count for IM floaters that are popped out but not focused.
2013-08-24 21:35:14 -04:00
Inusaito Sayori
74698fa3d8
Yet another attempt to solve Issue 929, bridge autodetach
...
This time we go through with the bridge attach but we setup a callback to detach once attachment process has gone through
2013-08-24 21:24:23 -04:00
Inusaito Sayori
8fc74855da
Solve Issue 925: Add "Show on Map" to right-click menu for landmarks in inventory
2013-08-24 19:41:39 -04:00
Inusaito Sayori
e9d8ceaa38
Finish Singu TODO: Texture Save As from inventory menu.
2013-08-24 19:35:30 -04:00
Inusaito Sayori
cde66a4169
Fix for Issue 598: shortcut ctrl+alt+F1(disable UI) conflicts with linux (switch to other tty)
...
Reload personal setting overrides no longer has a shortcut.
On Linux, ctrl-shift-F# is now used instead of ctrl-alt-F#
On other platforms, nothing else changes.
2013-08-24 19:28:32 -04:00
Inusaito Sayori
0c40a38a45
Append the count of unread IMs to the IM session's name in the communicate button's flyout list
...
ShowUnreadIMsCount can be set false to turn this off
2013-08-24 19:20:56 -04:00
Inusaito Sayori
a4802a4511
Set MeshMaxConcurrentRequests default back down to 32
...
The Lindens prefer it be this low and our users have found that lower is better lately.
2013-08-24 16:09:15 -04:00
Inusaito Sayori
fea628fd82
Fix a conflict with the inventory offer button enum and the profile button's index
2013-08-22 10:09:12 -04:00
Inusaito Sayori
f90752e81c
Correct a potential memory leak
...
Thanks to Ratany for drawing my attention to it.
2013-08-22 10:06:34 -04:00
Inusaito Sayori
4607bb6ea0
Feature request: Hang onto last values for Ease In and Ease Out for future animation uploads (Issue 984)
2013-08-20 06:09:07 -04:00
Inusaito Sayori
241b153aaf
Restore Legacy Behavior: Display tooltips on scrolllisttext cells as long as there's text there, not just if that text is truncated
2013-08-19 22:59:57 -04:00
TighMacFanatic
7783b835f0
Fix swapped enum so I don't break anything unexpected.
2013-08-18 02:07:12 -04:00
Aleric Inglewood
cc9fc6b868
First attempt to deal with broken (pre multiwear) inventory items.
...
Since multiwear, the low 8 bit of inventory items, if they are of type
IT_WEARABLE, is used for the wearable type (WT_*). Older viewers and
bots (like Second Inventory) create inventory items with 0 in those
bits. This causes all those item to appear as shapes in multi-wear
capable viewers.
This gives rise to many problems:
1) You can't wear them, because the inventory and asset wearable type
mismatch, which makes Singularity just abort.
2) Before it aborts, it already removed your old shape, thinking you
are about to wear another shape - and told the server that you are
wearing this broken item now. The result is that you see no change,
until you relog when you are suddenly wearing the broken "shape"
and stay a cloud forever.
This commit detects the problem for AT_CLOTHING wearables, because
they are not compatible with the type 'shape' after all (which is
is AT_BODYPART). It still doesn't know what the wearable type is, but
sets the type temporarily to the new value WT_UNKNOWN. Since this is
at least not a shape anymore, it doesn't cause you shape to be removed
when wearing it. Moreover, once the asset is downloaded, the mismatch
is detected and corrected: you can now wear -say- pants, or other
clothing.
Inventory clothing items with an unknown wearable type now have a
red question mark icon in the inventory.
What does NOT work yet:
1) If you copy such an item and paste it, then the new copy has
a shape icon again (and all the previously mentioned problems).
2) If you wear broken hair, skin or eyes (which still show as
shapes in the inventory) then your shape is still removed, and
wearing them fails because they are not multiwear capable and you
are already wearing such a body part. What should be done here
is that the removed shape is added back and the real body part
that you're trying to wear is removed.
3) Although this code attempts to fix the mFlags in the inventory,
the icon in the inventory doesn't change from question mark to the
right thing.
2013-08-18 02:50:31 +02:00
TighMacFanatic
9fc7c84f74
Added a third option to hear voice from everywhere so position does not affect volume/panning.
2013-08-17 12:20:03 -04:00
Inusaito Sayori
51532aa22c
Fix Issue 1012: Private voice call
...
The original purpose of the patch removed here was to fix this very bug, though I could not reproduce it at that time...
There must still be an edge case where this bug will reproduce but I tweaked the involved settings around quite a bit and could not reproduce it
2013-08-16 00:49:34 -04:00
Inusaito Sayori
6910a2feca
User-configurable log filename date formatting (When using "Append date to log filename")
...
The old defaults remain the same, so no worries for old users of this feature
Modify LogFileLocalChatDateFormat and LogFileIMsDateFormat in debug settings, use strftime's format specifiers.
The above mentioned settings are per account.
Inspired by irssi
2013-08-15 23:25:00 -04:00
Inusaito Sayori
a5287ee975
Adjust chat log opening functions to use LLLogChat functions to determine log file
...
This eliminates the possibility of the history button not opening the log file, which has been reported in the past.
This also corrects cases where log files named with date would not be opened.
2013-08-15 21:52:40 -04:00
Damian Zhaoying
1e64d41bdc
Fixed typos and Syntax errors in notifications.xml and strings.xml files, update other strings
2013-08-15 20:35:04 -03:00
Inusaito Sayori
03b384334c
Feature Request: Show profile from inventory offer notifications
2013-08-15 01:36:07 -04:00
Inusaito Sayori
a5705bd459
IRC Feature Request: Ability to show only legacy names for speakers (in Adv. Chat->Chat UI preferences)
2013-08-15 00:06:09 -04:00
Inusaito Sayori
0b9f14fff7
Feature request: Show profile on Teleport Offer notifications
2013-08-14 22:02:15 -04:00
Inusaito Sayori
b00e39f211
Continuation of the ongoing effort to change intrusive notifications into notifytips
2013-08-14 21:32:54 -04:00
Inusaito Sayori
75e5f87998
Fix Issue 1011: Intrusive on death teleport notification
2013-08-14 21:19:56 -04:00
Inusaito Sayori
e21a631b87
Feature Request: Parse periods in query as spaces in legacy people search
2013-08-14 21:00:10 -04:00
Latif Khalifa
c07646ff38
Include winmm.dll in the Windows installer
2013-08-14 22:41:43 +02:00
Inusaito Sayori
709c3ec877
Fix the crash upon opening Bumps, Pushes & Hits Floater
...
There are two types of font names, the camelcase and the all uppercase
Since mostly uppercase is used for scroll lists, this issue went undetected
but both types are used upstream, so we now look for camelcase if we couldn't get an uppercase one
The crash itself is avoided by falling back on SansSerifSmall if no known font has the name provided.
2013-08-14 14:25:59 -04:00
Inusaito Sayori
07e09be280
Modernization of LLFloaterBump that took place while working on the issue solved in next commit
2013-08-14 14:17:08 -04:00
Inusaito Sayori
56a6c91aac
Fix the issue of script limits floater popping up after it was closed
2013-08-14 11:13:00 -04:00
Inusaito Sayori
7aaef519d4
Cleanup translations (mainly to not have control names and blank labels copied over)
2013-08-13 18:03:58 -04:00
Inusaito Sayori
04c91a1393
Touchup to conform to format standard
2013-08-13 17:20:00 -04:00
Inusaito Sayori
2dc63a3463
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-08-13 17:18:35 -04:00
Latif Khalifa
20687aee86
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-08-13 03:17:24 +02:00
Shyotl
2f7b1e3d9b
Added bits required for webkit volume adjustment to work on windows (xp included).
2013-08-12 20:15:57 -05:00
Latif Khalifa
4b1329095e
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
2013-08-13 02:53:13 +02:00
Latif Khalifa
d0a6531bbf
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-08-13 02:52:47 +02:00
Aleric Inglewood
d7d361004a
Allow export full perm item on opensim if it doesn't support the export bit.
...
This addresses
https://code.google.com/p/singularity-viewer/issues/detail?id=1003
2013-08-13 02:31:30 +02:00
Melanie
c6661cf789
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-08-13 01:38:35 +02:00
Melanie
c8d301f05d
Replace FIRST LAST markers with NAME
2013-08-13 01:38:12 +02:00
Latif Khalifa
8f43868f82
1.8.1
2013-08-12 16:57:27 +02:00
Latif Khalifa
03af92c93e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-08-11 04:55:26 +02:00
Shyotl
f68e89cec6
LLMeshHeaderResponder and LLMeshLODResponder retry mechanisms.
2013-08-10 20:18:31 -05:00
Damian Zhaoying
62e0db83bd
Merge remote-tracking branch 'Liru/master'
2013-08-10 20:11:47 -03:00
Melanie
c9888fb72f
Translation update - now 83% complete. Much was merged from Firestorm.
2013-08-10 23:41:05 +02:00
Inusaito Sayori
650f9857bf
Bump RLVa version to 1.4.8, turn Prim Media Autoplay and Idle status tag settings off by default
2013-08-09 19:31:37 -04:00
Damian Zhaoying
412459ec3d
Update Spanish Translations.
2013-08-09 13:30:59 -03:00
Damian Zhaoying
aa818eb32e
Merge remote-tracking branch 'Liru/master'
2013-08-09 10:17:00 -03:00
Inusaito Sayori
d6aace58b3
Fix the borders of drop targets to look like they did back in 1.8.0
2013-08-08 22:02:24 -04:00
Inusaito Sayori
5b4b2b1078
Fix the load button on web tab of profiles not working, thanks to goldlatias for pointing this out.
2013-08-08 21:52:36 -04:00
Inusaito Sayori
7a2a7f531f
Add default object texture id to perms check
2013-08-08 20:32:02 -04:00
Inusaito Sayori
fb32e500dc
Fix the spinners on the map and on the god tools floater being too small because of unused label_width.
2013-08-08 16:03:01 -04:00
Inusaito Sayori
4b8db31073
Fix Issue 992: Singularity will not allow teleports above 4096, nor building above 4096.
...
Teleport height restrictions have been increased to 8192
-The 4096 limit isn't in much of the teleport code anyhow, and it's certainly not enforced.
Building height restrictions are now hooked up to hippolimits, apparently they hadn't been
-MAX_OBJECT_Z, and hardcoded 4096s now use gHippoLimits->getMaxHeight() instead
-On floater_tools.xml max_val is left out, instead it is set with the rest of the gHippoLimits edit constraints in LLPanelObject::getState
2013-08-08 16:00:49 -04:00
Damian Zhaoying
ca61a11825
Merge remote-tracking branch 'Liru/master'
2013-08-08 13:43:19 -03:00
Inusaito Sayori
4c69074564
Fix squares showing up on God Tools floater because of tabs being used for xml spacing
2013-08-08 01:57:05 -04:00
Inusaito Sayori
cc534487c0
Fix StockMaster's issue of the radar alerting ten seconds after avatars have departed
2013-08-08 00:06:32 -04:00
Inusaito Sayori
b17cebd87f
Allow multi select on the group members list in the general tab (How did this slip by me?)
2013-08-07 13:55:38 -04:00
Inusaito Sayori
102bf18195
Typo fix
2013-08-07 11:02:44 -04:00
Damian Zhaoying
2679148aec
Merge remote-tracking branch 'Liru/master'
2013-08-07 04:32:26 -03:00
Inusaito Sayori
cac18c1bc6
Typo fix: onPatialExportConfirm should be onPartialExportConfirm
2013-08-06 23:46:47 -04:00
Latif Khalifa
8fb8a1af34
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
2013-08-07 03:42:51 +02:00
Inusaito Sayori
ae9eb0003e
Fix Issue 938: Pressing enter on the login screen doesn't log in
...
Fixes side issue with location combo's focus not being lost during onClickConnect
2013-08-06 21:30:09 -04:00
Damian Zhaoying
8f16460bdb
update spanish translation: fix in panel_login.xml file
2013-08-06 16:05:23 -03:00
Damian Zhaoying
1a59de0db8
Merge remote-tracking branch 'Liru/master'
2013-08-06 15:26:08 -03:00
Inusaito Sayori
2e36b569ad
Fix focusing marked via the radar menu not working
2013-08-06 10:05:20 -04:00
Inusaito Sayori
7de20f8e98
Eep, this escaped the dummy ui warning commit yesterday.
2013-08-06 09:55:17 -04:00
Inusaito Sayori
fb01a95622
Fix Tobi Genesis' issue of the console sitting over the login fields after a failed login when hiding login screens.
2013-08-06 09:54:26 -04:00
Inusaito Sayori
3fa69e0337
Fix creating dummy ui warning on the login panel
...
Part of my ongoing work to fix enter not working on the login screen
2013-08-05 20:19:56 -04:00
Inusaito Sayori
c5782d9b90
Correct a typo: AntiSpamNotFriends should be AntiSpamNotFriend
2013-08-05 14:34:07 -04:00
Inusaito Sayori
f194a884db
Fix SignaledType not compiling on Windows
2013-08-05 14:15:33 -04:00
Inusaito Sayori
95175016d3
Fix assert caused by misuse of ScriptTeleportRequest message block data
...
Thanks to Nomade and Esmeralda for catching this one!
2013-08-05 11:10:18 -04:00
Melanie
5a5b18b475
German translation: Remove entries that don't actually translate anything. Add new translateable strings that the parser missed before.
2013-08-05 01:03:17 +02:00
Inusaito Sayori
8ca1079dee
Minor improvement to SignaledType
...
Allows using non-void functions as callbacks, as originally intended.
2013-08-04 14:13:45 -04:00
Damian Zhaoying
67a57bd35f
update spanish translation: add New menu avatar floater, Multiple voice support checkbox in preferences
2013-08-03 22:51:02 -03:00
Melanie
52c956ab38
Update the changes to the German translation after merge.
2013-08-03 23:47:29 +02:00
Melanie
fa6b021d83
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-08-03 23:44:26 +02:00
Melanie
5197449598
Remove some horrid translation artefacts from German translation. Remove unnecessary end tags. Add new translations.
2013-08-03 23:40:33 +02:00
Latif Khalifa
e939f0f7bc
Merge branch 'bug_fix_20130802' of git://github.com/Apelsin/EffervescenceViewer
2013-08-03 01:41:45 +02:00
Inusaito Sayori
9411b463e2
Expose VoiceMultiInstance as a checkbox on the Voice tab of Preferences
2013-08-02 19:41:04 -04:00
Latif Khalifa
11b904af36
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-08-02 23:56:34 +02:00
Inusaito Sayori
b3c1271215
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-08-02 17:53:04 -04:00
Inusaito Sayori
b98f970399
Missed a few lines in the initial radar menu commit, my bad. (fixes radar specific menu entries not working)
2013-08-02 17:52:53 -04:00
Inusaito Sayori
73021182b2
Basic menus for all the remaining avatar lists in group profiles.
2013-08-02 17:33:31 -04:00
Inusaito Sayori
1ccba509a8
Feature Request: If web profiles are available and are not shown by default, offer a menu entry to show them from avatar lists
2013-08-02 17:04:48 -04:00
Inusaito Sayori
ba7d55be73
Removed Report Abuse from the avatar list menus for now, it doesn't work
2013-08-02 17:03:19 -04:00
Inusaito Sayori
740513b097
Broke out duplicated list menu code blocks into functions
2013-08-02 17:02:13 -04:00
Inusaito Sayori
35a99acdaf
Fix the issue where mic gets left on after leaving a voice call
2013-08-02 16:54:36 -04:00
Inusaito Sayori
d7ac52afd7
Fix MyBrains Gottfried's issue of device settings switching to default device on apply
2013-08-02 16:52:36 -04:00
Inusaito Sayori
19f03e179d
Bug fix for is_owned_by_me check: if session_id can't be found as a source object, try from_id
2013-08-02 16:50:31 -04:00
Inusaito Sayori
ea69a7bfa9
Ratany's Feature Request: Add antispam dialog filter bypasses(own objects and friends) and condense antispam dialog blocking into a single function
2013-08-02 16:49:19 -04:00
Aleric Inglewood
6f733f6f62
Documentation update.
2013-08-02 13:04:56 +02:00
Apelsin
47b59d146b
LLVOVolume::getApproximateFaceNormal bug fix
2013-08-02 01:11:48 -07:00
Inusaito Sayori
27dcbef8fa
Mewmew
2013-08-01 19:58:37 -04:00
Damian Zhaoying
2c76d0c156
fix update spanish translations for menu avi list
2013-08-01 16:02:03 -03:00
Damian Zhaoying
811935b43c
update spanish translations for menu avi list
2013-08-01 15:00:00 -03:00
Shyotl
52f6c5830c
Lazy startup crash fix. Do we really care about a browser init message, especially before the UI is even initialized? I'd say probably not.
2013-08-01 02:31:20 -05:00
Inusaito Sayori
d956f60c0b
You, my friend, are a victim of disorganized thinking.
2013-07-31 17:19:01 -04:00
Inusaito Sayori
8b0b0b092f
Compile fixie
2013-07-31 17:05:58 -04:00
Latif Khalifa
944db75b89
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-07-31 22:19:30 +02:00
Inusaito Sayori
d0dee3da59
Pre-fill the Request Teleport text box
2013-07-31 16:18:43 -04:00
Inusaito Sayori
ff6dc9341d
Add basic menu_avs_list to Friends List and People Search
2013-07-31 15:56:12 -04:00
Inusaito Sayori
9042ccde00
Exchange most of the buttons on the instant message floater for a flyout button that offers more like Request Teleport!
2013-07-31 15:54:55 -04:00
Latif Khalifa
94947ac58d
Changed license to be V3 compatible
...
Fixed count when stride is > 1
2013-07-31 21:53:29 +02:00
Latif Khalifa
e4b446217c
Enable export menus if anything is exportable
2013-07-31 21:52:01 +02:00
Inusaito Sayori
d1f3acdd28
Fix estate eject/ban via list crash
2013-07-31 15:51:56 -04:00
Inusaito Sayori
f4dc82784f
Allow flyout button items to have the label attribute
2013-07-31 15:51:00 -04:00
Inusaito Sayori
04c78a1d8a
Merge in Storm-1838
2013-07-31 15:49:34 -04:00
Inusaito Sayori
9676eac3db
Add invite to group to the avatar list menus
2013-07-31 12:44:18 -04:00
Inusaito Sayori
246449192f
Explicitly check for OpenSimExtras and subfields
2013-07-31 10:30:03 -04:00
Inusaito Sayori
d6b7e61918
Make mSearchURL a SignaledType and add setSearchURLCallback for setting callbacks on it.
2013-07-31 02:55:06 -04:00
Inusaito Sayori
1c447a107e
Give SignalType a default constructor that calls the default constructor of Type
2013-07-31 02:53:51 -04:00
Inusaito Sayori
9d47090852
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-07-31 02:28:08 -04:00
Inusaito Sayori
7a1afcabb9
Change modes for llpanelvoiceeffect.*
2013-07-31 02:26:19 -04:00
Inusaito Sayori
41bf9681c4
Introduce menu_avs_list.xml and use it for Active Speakers list, About Land's ban/allow lists, Group profile general tab list, and chat participants lists.
2013-07-31 02:25:35 -04:00
Inusaito Sayori
d0c18bc54c
Modernize LLPreviewScript
...
Should fix Fritigern's recent issues, seems to. (Mainly, the double clicking on script errors not working right thing)
Should also fix that issue someone has brought up in group chat about the delay in our external editor sync in comparison to V3
2013-07-31 02:20:55 -04:00
Inusaito Sayori
c4610214fc
Prevent that annoying issue where new scroll list menu flashes in the bottom left corner briefly when created.\
2013-07-31 01:36:29 -04:00
Latif Khalifa
b4bc9727f1
Confirm to new OpenSimExtras specification of SimulatorFeatures cap
...
See: http://opensimulator.org/wiki/SimulatorFeatures_Extras
* Moved SupportsExport inside this map to avoid possible
collision with Linden Lab
* Added the ability for a sim to specify map server
(Fixes maps after hypergrid jumps)
2013-07-31 04:24:13 +02:00
Latif Khalifa
8cb7c2cb2f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-07-31 02:45:34 +02:00
Shyotl
353586f631
Missed a couple lines in earlier commit.
2013-07-30 19:41:13 -05:00
Latif Khalifa
bde1ce7577
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-07-31 01:53:58 +02:00
Inusaito Sayori
545d104212
Scriptcounter touchup: Fix end when deleting inventory
2013-07-30 11:26:58 -04:00
Shyotl
1c0d86a383
Fix issue displaying material faces with a shine value applied when performing deferred rendering. Also attempt to fix rigged material faces when performing deferred rendering (Todo: test rigged mesh material+(shiny|alpha|alphamask|fullbright) combinations)
2013-07-30 03:01:09 -05:00
Shyotl
8e40d6b52c
Added some missing drawpool determination logic pertaining to face materials.
2013-07-29 19:39:59 -05:00
Shyotl
44909af372
Removed CLEAR_INVISIBLE drawable flag.
2013-07-29 19:32:15 -05:00
Shyotl
45b85070f3
A bit of harmless cleanup, null checking, nan checking. Removed sphericalProjection and cylindricalProjection from llface (broken/dead).
2013-07-29 19:23:30 -05:00
Latif Khalifa
e427e1b93f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-07-30 02:11:02 +02:00
Latif Khalifa
fb3e24cfa3
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-07-30 02:10:50 +02:00
Inusaito Sayori
87be371042
Feature Request: Add shortcut, Ctrl-Alt-Shift-C, for Avatar Rendering Cost
2013-07-29 20:09:38 -04:00
Inusaito Sayori
977adf250b
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-07-29 20:05:52 -04:00
Inusaito Sayori
f6fb0ca8a0
Enable Parcel Ban and Access lists regardless of parcel rights.
2013-07-29 13:41:26 -04:00
Damian Zhaoying
f680c27bdf
Merge remote-tracking branch 'Liru/master'
2013-07-29 14:28:33 -03:00
Inusaito Sayori
8680e4599c
Satisfy Issue 904: Add option to close appearance floater with Esc
...
Setting AppearanceCloseOnEscape to true will turn this on.
2013-07-29 13:27:07 -04:00
Latif Khalifa
74c3903393
Always send version and channel to the login page
2013-07-29 19:08:02 +02:00
Inusaito Sayori
258c0da8d3
Apply fix for windows compile warning from internal
2013-07-29 12:42:48 -04:00
Aleric Inglewood
e88a0d2f9f
Merge remote-tracking branch 'singu/master'
2013-07-29 00:08:05 +02:00
Aleric Inglewood
694085ab78
Fix crash in LLDrawable::getSpatialBridge
...
Fixes https://code.google.com/p/singularity-viewer/issues/detail?id=972
2013-07-29 00:05:23 +02:00
Inusaito Sayori
353e2977d6
[Voice Update] Further sync llvoiceclient and llvoicevivox with upstream
...
Mainly tiny motions to ease merging as viewer-vivox2 work continues
Condenses MultiVoice block
2013-07-27 16:48:35 -04:00
Inusaito Sayori
641067c399
[Voice Update] Apply updates from Viewer-Vivox2
...
Applies the following commits:
4c13e7c - Interim version with SLIM removed from voice.
4c13e7c753
9cad21a - Thanks mercurial.
9cad21adc1
Only the changes that should have been in 4c13e7c (removal of LLVivoxVoiceClient::accountListBlockRulesSendMessage() and LLVivoxVoiceClient::accountListAutoAcceptRulesSendMessage())
9c94b96 - Removed debugging.
9c94b96ed3
ec77595 - Turn off logging.
ec775958ef
857cab1 - Kill all the vivox logs
857cab153e
2013-07-27 16:41:08 -04:00
Inusaito Sayori
2b2a6d5ea6
Touchups to scroll list building
...
Moved handling of mouse_wheel_opaque and menu_file to setScrollListParameters
Removed setToolTip block from LLScrollListCtrl::fromXML since setToolTip lives inside of LLView::initFromXML which is called by LLUICtrl::initFromXML which was already called at this point
Added support for building columns from xml with relative_width which is synonymous with relwidth
Fixed namelist columns not supporting dynamic_width in xml (dynamicwidth is only acceptable in older xmls)
2013-07-27 16:40:26 -04:00
Damian Zhaoying
4cda1e61c4
Spanish translations updates: new notifications strings
2013-07-27 15:54:59 -03:00
Latif Khalifa
6088ed50a8
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-07-27 17:48:16 +02:00
Latif Khalifa
858e1806eb
Make prim media autoplay setting in line with what the other viewers
...
Turning it on by default
2013-07-27 17:48:01 +02:00
Damian Zhaoying
bfbdd12a7f
Spanish translations updates / Radar Menu
2013-07-27 06:25:19 -03:00
Lirusaito
a864acd74b
[Radar] Add menu to the radar
2013-07-26 16:30:44 -04:00
Lirusaito
d82a2d0392
Add support for generic list menu listeners
...
This adds enablers/visiblers: "List.EnableAnySelected" "List.EnableMultipleSelected" "List.EnableSingleSelected" "List.EnableCall" "List.EnableIsFriend" "List.EnableIsNotFriend" "List.EnableMute" "List.EnableOfferTeleport"
This adds click callbacks: "List.CopyUUIDs" "List.OfferTeleport" "List.Pay" "List.RemoveFriend" "List.RequestFriendship" "List.ShowProfile" "List.StartAdhocCall" "List.StartCall" "List.StartConference" "List.StartIM" "List.AbuseReport" "List.ParcelEject" "List.Freeze" "List.EstateBan" "List.EstateEject" "List.ToggleMute"
Exposes LLRegionInfoModel::sendEstateOwnerMessage to the public to avoid further duplicated code
2013-07-26 16:29:28 -04:00
Aleric Inglewood
1475832617
Crash fix in LLPipeline::renderDeferredLighting
2013-07-26 17:32:03 +02:00
Lirusaito
deee31d04a
Add LLAvatarActions::copyUUIDs
...
An adaptation of a similarly named function in Alchemy Viewer
Thanks Alchemy, Thalchemy.
2013-07-26 09:00:40 -04:00
Lirusaito
37669a8abc
Add LLAvatarActions::buildResidentsString
2013-07-26 08:59:14 -04:00
Lirusaito
cfaaac3c96
Add LLAvatarActions::showProfiles that takes a vector of uuids, for opening a bunch of profiles at once
2013-07-26 03:20:42 -04:00
Damian Zhaoying
b0c00e1c15
minor spanish translations updates
2013-07-26 01:50:05 -03:00
Lirusaito
5bc9ce41c7
Feature Request: Add an option to disable camera resetting upon motion
...
Adds View->Motion Resets Camera, and keyboard shortcut Alt-Shift-R
Adds debug setting SinguMotionResetsCamera
2013-07-25 23:39:32 -04:00
Lirusaito
e03d469bcf
Feature Request: Provide a way to open SLURLs without needing to post them in chat
...
Adds chatbar as commandline command /open, which also allows opening urls as a bonus.
2013-07-25 12:43:22 -04:00
Lirusaito
b16072b640
Feature Request/Bug Fix: Restore the old behavior of allowing mapto region/x/y/z for specifying coordinates
...
Also swaps settings to be alphabetical, forgot to save that change before last commit.
2013-07-25 12:39:22 -04:00
Lirusaito
fe65520794
Color improvement for radar shout range color for skins that don't override the default, contributed by Aquafox Ruggles
2013-07-25 08:15:18 -04:00
Lirusaito
389cf5399e
Feature Request: Create landmarks with the legacy style names: Parcel, Region (x, y, z)
2013-07-25 08:06:49 -04:00
Lirusaito
b1004f9f53
Patch from internal: Keep gWindowTitle consistent with the window title.
2013-07-25 06:41:52 -04:00
Lirusaito
b17b0615c6
Another stab at fixing bridge autodetach
2013-07-25 06:40:44 -04:00
Damian Zhaoying
ccddd13631
Fix and Update some spanish UI files
2013-07-25 04:45:14 -04:00
Damian Zhaoying
a248d8c3c0
update and fix spanish translations
...
Conflicts:
indra/newview/skins/default/xui/es/floater_customize.xml
2013-07-25 04:44:58 -04:00
Aleric Inglewood
779cc82750
Stop viewer from flooding the server.
...
On a parcel with voice disabled, the viewer keeps requesting voice info
every two frames, cycling between states stateNoChannel and
stateRetrievingParcelVoiceInfo.
This commit fixes that: if voice is disabled on the parcel then mAreaVoiceDisabled
is set (because the url is empty) and we stop requesting voice info until the parcel changes again.
If voice is enabled while we are in the stateNoChannel then we drop
out of that because mNextAudioSession gets set (to stateJoiningSession).
If the viewer has voice disabled, then now it drops correctly
out of the stateNoChannel into stateDisabled.
2013-07-23 21:31:53 +02:00
Aleric Inglewood
f154ff8f8a
Crash bug fix.
...
I ran into this on opensim.
The value of 'bucket' passed to parse_lure_bucket was empty.
In general, we should check we HAVE eight tokens, and not
just keep incrementing the iterator without checking.
2013-07-23 21:29:35 +02:00
Latif Khalifa
bd88b91b42
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-07-23 14:53:47 +02:00
Latif Khalifa
b129108245
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-07-23 14:53:38 +02:00
Lirusaito
b082bc5056
Support <string name="foobar" value="foobar "/> in panel classes, like upstream
2013-07-22 23:58:03 -04:00
Lirusaito
8b5a654c5b
General cleanup of LLFloaterCustomize
2013-07-22 23:50:03 -04:00
Lirusaito
4e63a64a1d
Feature Request: Add tooltip to Save Outfit button showing where it will save to
...
Adds refreshCurrentOutfitName() from upstream
2013-07-22 23:49:19 -04:00
Lirusaito
989e4332b7
Feature Request: Setting to disable lighting change of appearance mode
2013-07-22 23:02:02 -04:00
Lirusaito
d64c9a343c
Fix issue of columns not sorting in ascending order by default
2013-07-22 20:02:45 -04:00
Aleric Inglewood
dcf1cdbc4e
Move export permission check to LLPermissions, try two.
...
Removes code duplication.
Several parts of the code ignored the PERM_EXPORT but
and still did demand that things are full perm next
to being a creator. This has now changed the export
rules are the same for everything as they were for mesh:
you need to be the owner and the creator for every element
that is exported (not just the root prim, of course).
2013-07-22 22:48:42 +02:00
Aleric Inglewood
be6699198f
Revert "Handle PERM_EXPORT in LLPermissions."
...
This reverts commit 9c71afe73e .
2013-07-22 19:49:00 +02:00
Latif Khalifa
e60032da6f
Default service for Singularity pages is on Github
2013-07-22 18:42:33 +02:00
Latif Khalifa
b70c306e5f
Pass-through login splash page that allows update notifications.
...
Page source: https://github.com/singularity-viewer/login-page
2013-07-22 16:31:20 +02:00
Latif Khalifa
fe49fe1928
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-07-22 16:11:48 +02:00
Latif Khalifa
b3c0a693f1
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-07-22 16:11:31 +02:00
Aleric Inglewood
937322cc93
Update wearable import to use the new export data.
...
Better/more notifications.
No longer applies UUIDs of textures exported on a different grid,
except for secondlife <--> secondlife_beta, but with a warning.
2013-07-22 02:34:25 +02:00
Aleric Inglewood
9c71afe73e
Handle PERM_EXPORT in LLPermissions.
...
This moves all export test code to where it belongs:
in LLPermissions.
Added LLPermissions::allowExportBy, next to
allowModifyBy, allowCopyBy and allowMoveBy.
Then changed all code to use this call.
Because LLPermissions is part of llinventory, I had
to add a proxy for LFSimFeatureHandler.
Added a new class LFSimFeatureHandlerInterface that can be
used by LLPermissions to check simulator features by
accessing the LFSimFeatureHandler singleton.
Several parts of the code ignored the PERM_EXPORT but
and still did demand that things are full perm next
to being a creator. This has now changed the export
rules are the same for everything as they were for mesh:
you need to be the owner and the creator for every element
that is exported (not just the root prim, of course).
Export rules can now be easily made a function on
simulator features. If different rules apply for different
types (wearables, objects, mesh etc) then an extra variable
indicating the type will have to be passed though.
2013-07-22 02:22:21 +02:00
Lirusaito
c3b4ceff97
Fix venusmari's issue of not being able to drag and drop calling cards to people via profile or IM
2013-07-21 12:48:57 -04:00
Lirusaito
f98f1e9f5d
[Radar] In expireAvatarList, use the return value of erase
2013-07-21 09:59:35 -04:00
Lirusaito
799b5408e4
[Radar] Fix up expireAvatarList to actually expire all the dead avatar entries, not just the back one.
2013-07-21 04:57:33 -04:00
Lirusaito
845088166a
[Radar] Switch from using frames in keeping track of ranges to using a bitset
...
Renames ALERT_TYPE_* to STAT_TYPE_* and ERadarAlertType to ERadarStatType
Removes mIn*Frame and accessors for these in favor of checking for the bit in mStats
Use mStats instead of mAgeAlert now.
Moves the range leave handling out of getAlive and into setPosition, where it logically belongs
Should fix Issue 43: Radar reports multiple times for agent entry upon rendering
2013-07-21 04:43:01 -04:00
Lirusaito
3650a56407
[Radar] Remove id null checks where null id is an impossibility due to earlier checks
2013-07-21 02:06:57 -04:00
Lirusaito
82c37ca9a3
[Radar] Remove unused member mDrawPosition
2013-07-21 01:24:58 -04:00
Lirusaito
6fb68b4913
[Radar] Add a debug setting RadarRangeRadius to limit how far away avatars showing up on radar can be (0, the default, is unlimited)
2013-07-20 23:16:29 -04:00
Lirusaito
2d55b1ab1c
[Radar] Condense updateAvatarList to have less duplicate code
2013-07-20 23:07:04 -04:00
Lirusaito
98813c75f3
[Radar] Remove duplicate code from updateAvatarList that was already performed during LLWorld::getAvatars
2013-07-20 23:02:14 -04:00
Lirusaito
72a335daf0
[Radar] Move avatar age block into processProperties as this is more logical
2013-07-20 22:52:50 -04:00
Lirusaito
414ffb3a94
Further attempt to fix Issue 929 by having the appearance manager remove the attached bridge item
2013-07-20 13:59:15 -04:00
Latif Khalifa
742d36a79f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-07-20 18:36:40 +02:00
Aleric Inglewood
85ff52be30
Bug fix: circumvent using LLs notify system.
...
Can't use LLs LLFolderViewItem::rename from
LLInventoryPanel::modelChanged because it's nonrobust spaghetti code
and causes randomly sized loops.
Also cleaned up the number of unused nameOrDescriptionChanged functions
introduced in a previous commit.
2013-07-20 18:28:52 +02:00
Latif Khalifa
d012c822a2
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-07-20 08:14:23 +02:00
Lirusaito
791266fc27
Moved age alert and title changing blocks out of refreshAvatarList and updateAvatarList to fix them not working as well as they should
2013-07-19 23:56:20 -04:00
Lirusaito
ed1dbfaa81
Switch the IM and teleport callbacks of right-clicked inventory calling cards to LLAvatarActions
...
This is partially in attempt to reduce possible suspects for Issue 936: Talking to users with the lastname Resident sometimes creates logs without the delimiting space stripped out
2013-07-19 20:34:39 -04:00
Lirusaito
b2522a06b4
Attempt to fix Issue 929: [Regression] Automatic Bridge Detach does not work
2013-07-19 19:54:11 -04:00
Aleric Inglewood
7162214c01
Bug fix for last commit
2013-07-20 00:44:05 +02:00
Lirusaito
b4d33fe0e1
Fix up some logic with always allow fly
...
The fly button on the toolbar would enable itself despite RLVa restrictions
- This was because always fly was checked after gAgent.canFly(), despite the fact that gAgent.canFly() itself checks always fly setting at the correct time.
When teleporting to a region that blocks flying, the agent would start flying due to a strange check inherited from upstream.. My opinion is, they want gods to fly, but that's kinda strange too, so I've changed it to set flying false in this case.
2013-07-19 18:10:02 -04:00
Lirusaito
ab19bfb70e
Don't open inventory offers if busy, busy means busy.
2013-07-19 17:53:20 -04:00
Lirusaito
fe8df82c8d
Allow autoaccept to work when in busy mode by handling it first
2013-07-19 17:24:24 -04:00
Lirusaito
4dd0daa942
Feature Request: Ability to automatically accept all inventory offers
...
Replaces the exposed setting in popups preferences
However, for users wanting the old behavior of just landmarks, notecards, and textures being automatically accepted, the original setting(AutoAcceptNewInventory) stays as is, it can be turned on and off in debug
2013-07-19 17:05:07 -04:00
Lirusaito
c0c561c605
Tiny changes to have llviewermessage.cpp line up better with upstream
2013-07-19 16:24:41 -04:00
Lirusaito
7912eb1748
Update rlva (mainly in llviewermessage.cpp)
2013-07-19 16:17:34 -04:00
Aleric Inglewood
67a75ab4b6
Fix link problem: link with libboost_date_time-mt
2013-07-19 22:15:31 +02:00
Aleric Inglewood
611c4bd5fa
Merge remote-tracking branch 'singu/master'
2013-07-19 21:26:55 +02:00
Aleric Inglewood
325ef60a8c
Wearable export improvements.
...
Add grid nick to default filename.
Add grid nick and date to exported XML.
Add inventory path, name and description of item to exported XML.
2013-07-19 21:22:59 +02:00
Aleric Inglewood
1fdb36cc40
Actually use mask in LLInventoryView::changed
2013-07-19 21:20:21 +02:00
Aleric Inglewood
95a228b2e9
Actually use LLWearable::mDescription.
...
Set LLWearable::mDescription and keep it up to date.
This allows to export (and import) the description of wearables.
2013-07-19 21:17:42 +02:00
Lirusaito
3be04fc90b
Attempt to solve Issue 935: Script Chat Show The Owner?
2013-07-19 10:41:19 -04:00
Aleric Inglewood
66ef619415
Bug fix: Update name of worn wearable when changing the name in the Properties floater of an inventory item.
2013-07-19 16:13:48 +02:00
Lirusaito
7f57dd24d8
Satisfy Issue 852: Implement way to stop\start single non-fullperm script in modiable objects
2013-07-19 08:45:30 -04:00
Lirusaito
863c35710f
Feature Request: Add an option to keep last name Resident.
...
Should work to solve Issue 517: Legacy log handling of "Resident" name
2013-07-19 07:16:51 -04:00
Lirusaito
aaf010da4c
Feature Request: Make new ARC threshold change based on debug setting
...
Adds LiruNewARCLimit debug setting
2013-07-19 07:07:26 -04:00
Lirusaito
663d0a29f2
Attempt to satisfy Issue 82: Idle status in nametags doesn't always update properly
2013-07-18 23:19:34 -04:00
Lirusaito
85e667bb35
Don't use mAvatarNameCacheConnection, because it does indeed lead to partially populated namelists as predicted
2013-07-18 21:55:18 -04:00
Latif Khalifa
a74b8ddc6b
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-07-19 01:05:30 +02:00
Lirusaito
5286276d71
Fix names not appearing on the group inviter
2013-07-18 19:01:10 -04:00
Lirusaito
fc7cdc016a
Added menu listener for showing things on non-SL grids.
2013-07-18 18:53:52 -04:00
Aleric Inglewood
d21b3cb19b
Enforce a 60s reply delay for LLEventPollResponder
2013-07-19 00:47:56 +02:00
Lirusaito
ceb9c99736
Allow right clicking anywhere on a scroll list for a menu, except the header buttons
2013-07-18 15:51:28 -04:00
Lirusaito
306e587ae9
Fix the issue with having a column labeled "1" put on the end of the search results for places and land sales
...
Apparently when you skip a number for an LLSD, when it becomes a param that number translates to the expected field in all its emptiness
Since the column didn't exist in the scrolllist, a new one was added to the end
2013-07-18 12:49:50 -04:00
Lirusaito
813bb5cc7f
Don't send busy respond message when to_id is null, it will confuse the respondee
2013-07-18 10:14:29 -04:00
Lirusaito
080b807e38
Bug Fix: Don't use an empty string for the session name/label of autoresponse stuffs, that tries to log to nameless file.
2013-07-18 09:49:15 -04:00
Lirusaito
9db44e67e8
Oopsies, misplaced busy response block
2013-07-18 08:35:10 -04:00
Lirusaito
a5b8c173ac
Do not autorespond when incoming message is to everyone (null to_id)
2013-07-18 08:06:37 -04:00
Lirusaito
f1e792fde0
Separate busy response block from autoresponse, and use busy_message() function to avoid duplicate code
2013-07-18 08:05:11 -04:00
Lirusaito
90590e20ec
Fix issue with busy response to certain message types not respecting busy response settings such as wildcard resolution
2013-07-18 08:00:19 -04:00
Lirusaito
780019f0d6
Fix the About Land->Objects list
2013-07-18 06:44:17 -04:00
Lirusaito
d631ae8072
Add support for scrolllists with menus
...
In xml menu_file attribute can point to the file
In code, setContextMenu can take a prebuilt menu
2013-07-18 06:04:17 -04:00
Lirusaito
8d87d3410e
When the mouse leaves a scroll list, don't leave the mouse-over highlight shown
2013-07-18 04:58:29 -04:00
Lirusaito
baef50e451
Feature Request: Add the ability to see count of avatars in regions on the map without needing to hover
...
Adds LiruMapShowAvCount, which must be set true for this to work.
2013-07-17 13:49:05 -04:00
Lirusaito
52544f020e
Update RLVa bits in LLWorldMapView
2013-07-17 13:40:15 -04:00
Lirusaito
2b7c70d765
Update lsl stuffs (Adds support for all the new stuff we'd fallen behind on)
2013-07-17 12:59:01 -04:00
Lirusaito
a1d9473fde
Move ScriptQuestion strings from floater_chat_history.xml to strings.xml
2013-07-17 11:56:02 -04:00
Lirusaito
ede1282307
Feature Request: Support the expected behavior of F1 opening a browser for those who are used to this
2013-07-17 11:18:25 -04:00
Lirusaito
4b7a9dbd22
Commenting out Second Life Help menu entry until we decide what to do with it
2013-07-17 11:11:58 -04:00
Lirusaito
d7dddd29aa
Feature Request: Add Ctrl-Shift-E for edit linked parts
2013-07-17 10:43:30 -04:00
Lirusaito
cf8fe0c721
Actually fix combobox arrow positioning issue
2013-07-17 09:08:34 -04:00
Lirusaito
037b341931
When building media settings floater, don't open it. This fixes the annoying clicking sound whenever one would begin editing.
2013-07-17 03:21:23 -04:00
Lirusaito
56fd2f8bba
Touch up debug settings filter_editor
2013-07-17 02:48:39 -04:00
Lirusaito
a61d88c701
Don't setText to gibberish when building a search_editor or filter_editor fromXML
2013-07-17 02:43:53 -04:00
Lirusaito
bee21033b8
Fix Last Owner button on inventory item properties not working
2013-07-17 02:07:55 -04:00
Lirusaito
76f0f42f20
Update LLNameListCtrl, mostly to use Params for its elements
2013-07-17 02:07:17 -04:00
Lirusaito
c35a1c36e9
Translate "No group data found for group " with strings.xml string NoGroupDataFound
2013-07-16 20:40:58 -04:00
Lirusaito
300a23b6ad
Portuguese translation was falling too far behind, to avoid hassle, strings.xml and notifications.xml are now near identical to upstream
2013-07-16 20:23:01 -04:00
Lirusaito
c89a245323
Feature Request: Add Profile button to friendship offer notices
2013-07-16 17:34:36 -04:00
Lirusaito
fb22cfc6db
Fix name lists being derpy due to an apparent parsing failure
2013-07-16 17:29:57 -04:00
Lirusaito
d3d5f00453
Retro skin
2013-07-16 17:04:53 -04:00
Lirusaito
fcfa488cb5
Suppress warnings caused by additional parameters used in namelistitems not being convertible to scrolllistitem params
2013-07-16 11:54:05 -04:00
Lirusaito
887efcea14
Save personal attachments to mesh formats without having to drop them first
2013-07-16 11:02:32 -04:00
Latif Khalifa
817ce372a9
Build fix
2013-07-16 16:46:36 +02:00
Latif Khalifa
5dc0ba1712
ColladaExport: move root library nodes outside the loope
2013-07-16 16:27:32 +02:00
Latif Khalifa
01a675de0f
ColladaExport: made face transparency compatible with SL mesh import
2013-07-16 16:27:31 +02:00
Latif Khalifa
1852656661
ColladaExport: Added support for per-face materials
2013-07-16 16:27:31 +02:00
Latif Khalifa
b844b63f72
Factor out some common code when saving <source> element
2013-07-16 16:27:31 +02:00
Latif Khalifa
e0473b5292
Avoid crashing when trying to export non-volumes
2013-07-16 16:27:30 +02:00
Latif Khalifa
dc24e1b038
Merge remote-tracking branch 'lirusaito/master'
2013-07-16 16:26:53 +02:00
Lirusaito
bc753455df
French Translation Update by Nomade Zhao
2013-07-16 10:19:14 -04:00
Lirusaito
f9304faaec
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2013-07-16 09:50:58 -04:00
Lirusaito
824bec5d69
Two scrolllist update scraps find a home in this commit
2013-07-16 09:45:00 -04:00
Lirusaito
599704cf40
Display tooltip for scrolllist when not over headers or cells
2013-07-16 09:42:54 -04:00
Lirusaito
f05fa67786
Fix column header tooltips showing up when not over the header itself
2013-07-16 09:40:33 -04:00
Lirusaito
1b734e190c
Scroll List Classes Params
...
Params for LLScrollListCell, LLScrollListItem, and LLScrollListColumn
Moves code block for creating a LLScrollListCell out of LLScrollListCtrl::fromXML and into LLScrollListCell::create
Removes mDefaultListTextColor from LLScrollListCtrl, it is now used only in LLScrollListCell::create
Adds LLScrollListCtrl::addRow and LLScrollListCtrl::addColumn functions that take these Params
Separators are now built from an icon.. we may want to tweak it in the future, looks alright though
LLFloaterAvatarList::refreshAvatarList now builds elements with these Params instead of by LLSD
2013-07-16 09:33:26 -04:00
Lirusaito
af15010c79
Make radar string "Out Of Range" translatable
2013-07-16 08:04:38 -04:00
Lirusaito
67970ab2db
Allow tooltips for any scrolllist cell
...
Finally the radar activity icons have working tooltips to explain their meanings
This probably won't do anything until Params are plugged in, though.
2013-07-16 06:58:17 -04:00
Lirusaito
7113916d74
Prevent the radar from dividing by zero (May not be an issue yet)
2013-07-16 05:46:30 -04:00
Lirusaito
4b210c1bbf
Tiny update to voice code to avoid falling behind the Lindens
...
Adds support for secondlife:///app/voice SLapps
2013-07-16 05:41:14 -04:00
Lirusaito
d497e0d10e
Remove ancient emerald metadata commented out code from radar
2013-07-16 05:34:09 -04:00
Lirusaito
54bc9e18a9
Take advantage of the LLButton constructor for setting defaults of LLScrollColumnHeader
2013-07-16 05:32:11 -04:00
Lirusaito
3052bb38e6
Update llfloatertopobjects in preparation for using Params in certain scrolllist classes
2013-07-16 05:08:44 -04:00
Lirusaito
c261eb7433
Remove final parameter from LLScrollListCtrl::addStringUUIDItem, it was unused.
2013-07-16 00:56:40 -04:00
Lirusaito
9b92b51b2c
Fix internal issue of column headers not displaying tooltips
2013-07-16 00:52:59 -04:00
Lirusaito
cee9e976b1
Remove unused function LLScrollListCtrl::setDisplayHeading
2013-07-15 22:31:38 -04:00
Lirusaito
cb01bbb8ef
Move tooltip hosting from llscrolllistitem to llscrolllistcell
2013-07-15 22:24:34 -04:00
Lirusaito
1ef0cba32c
Fix internal issue with scroll column header font
2013-07-15 01:57:28 -04:00
Latif Khalifa
1c2cdd4166
Work in progress: Collada export
2013-07-15 06:38:12 +02:00
Latif Khalifa
6d1b4c5b27
Merge remote-tracking branch 'aleric/master'
2013-07-15 06:31:08 +02:00
Aleric Inglewood
6fd0baae5d
Bug fix: don't get web profile when grid does not support that.
2013-07-15 02:38:10 +02:00
Lirusaito
75c4503a46
Derive LLScrollColumnHeader from a button
...
Fixes the issue with single-click sorting not working
Fixes internal issue with initial column header names being used as their labels
2013-07-14 17:27:51 -04:00
Drake Arconis
a9d23a049c
Fix ugly left and right arrows in silver skin
2013-07-13 23:49:27 -04:00
Latif Khalifa
085947a557
Merge remote-tracking branch 'shyotl/master'
2013-07-14 02:38:13 +02:00
Shyotl
bec3ba985e
DIFFUSE_ALPHA_MODE_BLEND flag should disable auto-alphamasking on applicable face.
2013-07-13 19:36:33 -05:00
Lirusaito
02253563ce
IRC Feature Request: Show Last Owner in item properties
...
Translators should add these new bits (floater_inventory_item_properties.xml_
(also tossed in xml change I should've staged in 4da47de90c )
2013-07-13 17:40:19 -04:00
Lirusaito
4ef32a3805
Sync more stuff with upstream! (Mainly updates stuff involving LLFloaterGroupPicker)
...
Updates llfloatergroups to be a lot similar to upstream
- Adds LLFLoaterGroupPicker::removeNoneOption and changes LLFloaterGroupPicker to use modern style callback
- Switched from using per ui xml string for the none entry in groups to the strings.xml one, updated and cleaned existing translations to use this.
- Changes LLFLoaterGroupPicker into an instance tracker by id, because it was already acting like one.
Updates llpanelpermissions RLVa bits and fixes last owner label never enabled
2013-07-13 17:28:09 -04:00
Lirusaito
ffe403e0f0
Update administrative tools code from upstream
...
Updates LLFloaterTopObjects code to have parcel filter(STAT_FILTER_BY_PARCEL_NAME) and use the CallbackRegistrar
Top Objects XML (and Translation) bits updated in part from Firestorm, as LL Viewer lacks certain buttons and the old xml was too far behind
- Translators may want to have a look at this... although you sorta need to have estate powers for it to be of any worth... *sigh*
Updates LLFloaterGodTools to use CallbackRegistrar
2013-07-13 16:38:20 -04:00
Lirusaito
cf2f455430
Update LLFloaterInspect, updates RLVa code, fixes inspect not always working at first
2013-07-13 15:40:45 -04:00
Lirusaito
4da47de90c
Sync with upstream, improve RLVa and make use of the callback registrar
2013-07-12 18:43:59 -04:00
Lirusaito
c77f0de9cf
Refactor LLScrollList* and relatives
...
Breaks out llscrolllistcolumn, llscrolllistcell, and llscrolllistitem from llscrolllistctrl and llflyoutbutton from llcombobox
2013-07-12 17:47:01 -04:00
Shyotl
94ab22f6d6
Cursory materials alphamask parameter support (and only alpha mask)
2013-07-12 16:41:36 -05:00
Shyotl
e4da971026
Hooked up underlying material fetching mechanism and added material-related structures. Not integrated into rendering pipeline.
2013-07-12 13:56:31 -05:00
Latif Khalifa
5669b01873
Ask for confirmation of partial Wavefront exports
...
Fix some signed/unsigned warnings
2013-07-12 09:50:04 +02:00
Latif Khalifa
c769510c6f
Merge remote-tracking branch 'lirusaito/master'
2013-07-12 08:15:05 +02:00
Latif Khalifa
77f77b03b0
Merge remote-tracking branch 'shyotl/master'
2013-07-12 07:23:27 +02:00
Shyotl
ccff8475c1
Mesh vertex corruption fix taken from LL upstream.
2013-07-11 20:54:04 -05:00
Shyotl
6be6f488ba
Added setting to toggle autoplaying of prim media, independent of parcel media. Audio autoplay also now yieds to sounds being stopped via nearby media panel.
2013-07-11 20:53:12 -05:00
Lirusaito
1398d8afbc
Remove two unused LLScrollListItem::addColumn and LLScrollListIcon constructor via LLUIImagePtr.
2013-07-10 21:12:58 -04:00
Lirusaito
6d32a39544
Remove unused LLScrollListLineEditor class
2013-07-10 19:54:13 -04:00
Lirusaito
781bb288ab
Removed "textbox autofix" from translations and llpanelface.cpp, syncs up with Materials and fixes warnings
2013-07-10 19:26:31 -04:00
Aleric Inglewood
6a7f7bf4de
Oops - forgot something in last commit.
...
Now it works :). Tested with ssb too.
2013-07-11 00:31:21 +02:00
Aleric Inglewood
df71d4518e
Merge remote-tracking branch 'singu/master'
2013-07-10 21:31:49 +02:00
Aleric Inglewood
96b5f7bdc8
Add wearable exporting / importing in linden_genepool format.
...
As importing has been broken for a long time, I decided to
hijack the existing (broken) buttons of the Appearance floater
for the following new implementation:
The currently selected wearable, if full perm and the agent
is owner (of course) and creator, then that wearable can be
exported to disk with AIFilePicker in the context "archetype".
The used format is now XML, linden_genepool version 1.0, the
same format that is used when saving from Advanced --> Character
--> Character Tests --> Appearance to XML in any viewer.
However, unlike that Advanced option (which normally only
works when DebugAvatarAppearanceMessage is set to TRUE, ie in
the official Linden Viewer; but that does a lot more, most
likely unwanted things: it causes to dump files in this format
to the LL_PATH_LOGS directory whenever appearance data comes
by and other stuff for debugging purposes only), now ONLY the
selected wearable is written to the file. In the case of multiwear
with several layers, that means the selected layer, as well.
When importing these XML files again, only the selected
wearable/layer is overwritten (assuming it is modifiable) with
the data in the file that corresponds to that wearable (if
the file contains data of another wearable then nothing happens).
Note that this file format can be read by blender-avastar:
Using this feature to save the shape you created in SL will
allow you to import that into blender. Likewise, a shape created
or modified in blender can be imported into SL using this feature.
2013-07-10 21:19:42 +02:00
Aleric Inglewood
b97caa77d4
Add versioning support to AIFilePicker.
...
When saving a file, if the suggested filename has the form
PREFIX?000.EXT then the viewer checks if that file already
exists and if so, increments the number until it finds a
name that does not already exist (in the suggested directory).
The '?' is replaced with an underscore.
This allows to fast saving of the same data without overwriting
previous data.
2013-07-10 21:19:04 +02:00
Lirusaito
dfb4370a56
Remove iamHereLogin remnants overlooked in 62f03bc489
2013-07-10 08:12:13 -04:00
Lirusaito
7e874d7d56
Fix Issue 931: When viewing the profile of a muted avatar, the Mute button should be changed to Unmute
2013-07-10 07:35:50 -04:00
Lirusaito
742ccdcf0c
Touched up awavefront once more to conform to permissions and be used as intended
...
Added debug settings OBJExportNotifyFailed and OBJExportNotifySuccess for whether or not to notify about OBJ Exports failing or succeeding respectively
Moved exports back into tools submenu, there's not enough variety to justify a menu dedicated to exportation
Removed hardcoded "Insufficient Permissions" string, there's already a notification for this.
Implemented proper permissions checking, along with own Avatar Export.
2013-07-10 06:30:19 -04:00
Shyotl
8f3c1af82d
Fixed textentry combobox arrow positioning issues.
2013-07-10 02:15:47 -05:00
Latif Khalifa
8e503f2596
Added Wavefront OBJ format exporter
...
Exporter written by Apelsin:
https://github.com/Apelsin
TODO: Hookup avatar export
2013-07-09 22:04:27 +02:00
Aleric Inglewood
4779f91d5d
Fix Appearance Import button.
...
Params are driven by wearable; changing the base character gets
overwritten real quick.
Fixed to call the appropriate LLWearable::setVisualParamWeight.
I didn't test this in the light of multiwear -but it works for
the shape, which is good enough.
2013-07-09 03:09:06 +02:00
Latif Khalifa
62f03bc489
Fix loading the splash page from some broken OpenSim servers
...
Remove HTTP HEAD request that was made before the attempt to load
the splash web page before the URL was handed over to the WebKit
plugin
2013-07-08 21:18:09 +02:00
Latif Khalifa
f9b174c1c2
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
2013-07-08 17:54:57 +02:00
Aleric Inglewood
6103cb23e6
Allow people to login again.
2013-07-08 17:25:06 +02:00
Aleric Inglewood
d725be37f9
Merge remote-tracking branch 'singu/master'
2013-07-08 02:05:09 +02:00
Aleric Inglewood
fcf099a115
Add file picker for issue 630
2013-07-08 00:57:03 +02:00
Aleric Inglewood
ebfbdac5ab
Compile error work around.
2013-07-07 23:37:05 +02:00
Melanie
d43d103870
Remove the untranslated credits and licenses and the empty elements from the German translation.
2013-07-07 04:27:51 +02:00
Melanie
c20cffa33d
Change "Object say, text" to "Object: text" like it used to be. The former is just bad english.
2013-07-07 04:25:48 +02:00
Apelsin
a5edfdd376
Non-MO adjustment
...
(Gross typo)
2013-07-06 08:37:11 +02:00
Apelsin
9226c65e0c
Disable this by default...
2013-07-06 08:25:46 +02:00
Apelsin
7439f48223
Featurebug
...
=== Pull request version ===
Re-enabled fix for avatar body invisibility featurebug (archaic)
Added option to adjust maximum attachment span with settings
Added option to enable automatic derendering of huge attachments (use with care)
Conflicts:
indra/newview/app_settings/settings_effervescence.xml
2013-07-06 08:25:10 +02:00
Aleric Inglewood
ad6c539609
Crash fix
2013-07-06 00:06:51 +02:00
Aleric Inglewood
008a0936da
Compile fix
2013-07-05 23:55:20 +02:00
Latif Khalifa
f1e493291a
Merge remote-tracking branch 'shyotl/master'
2013-07-05 22:37:13 +02:00
Latif Khalifa
a329928dcd
Merge remote-tracking branch 'melanie_t/master'
2013-07-05 22:36:52 +02:00
Latif Khalifa
f2323c0c83
Merge remote-tracking branch 'aleric/master'
2013-07-05 22:36:35 +02:00
Shyotl
bbb0bd54bf
Fixed location combobox not updating properly when a slurl link is clicked. Reset the location combobox when a different grid is selected (added setCurrentGridChangeCallback to hippogridmanager). Moved login panel elements into a layout_stack so hiding the grid or location columns no longer leaves big empty gaps.
2013-07-05 02:28:36 -05:00
Melanie
5395de3e34
Add german translation preview (81% complete)
2013-07-05 06:11:19 +02:00
Shyotl
624141a31a
A break was missing from case logic in LLPanelLogin::onUpdateStartSLURL
2013-07-03 17:21:45 -05:00
Shyotl
7f981e6f17
'Typeregionname' combobox should have an empty value. Was hosing up logic in LPanelLogin::onUpdateStartSLURL.
2013-07-03 17:19:39 -05:00
Shyotl
c82ac0b0af
Added several missing mouse-event callback signals to LLUICtrl
2013-07-03 17:18:26 -05:00
Shyotl
0219186106
Use SHGetKnownFolderPath on vista/win7/win8, instead of deprecated SHGetSpecialFolderPath.
2013-07-03 17:16:37 -05:00
Shyotl
8310575fc3
added LLProgressView::abortShowProgress. Issue upon failed login to terminate pending loginpanel destruction which was killing the actual 'new' replacement loginpanel instead of the old to-be-deleted version.
2013-07-03 17:15:30 -05:00
Shyotl
4455dd7eff
When requesting an avatar reload, also reload all attachments (prior to this it was not possible to actually reload attachments on non-agent avatars)
2013-07-03 17:13:11 -05:00
Shyotl
b3d97b0860
Avoid running the motionblur shader if there hasn't been camera movement. Also clamp per-frame fragment velocity to reduce visual artifacts.
2013-07-03 17:12:12 -05:00
Aleric Inglewood
4b0b83797c
CURLIO (and libcwd): add number of established connections to http console.
...
I need to parse the debug output of libcurl for this, and choose
to not do that for a Release build - at which point it makes little
sense to even do it for a Debug build, since also the Alpha release
are 'Release'. Even though it would probably have no impact on FPS,
there would be like two persons looking at that number and understanding
it.
2013-07-04 00:02:28 +02:00
Aleric Inglewood
e0c66138c7
Increase connect timeouts for capabilities that demand short transfer times.
...
The automatic adjustment sets the connect time to 3 seconds, which might
be a bit on the short side sometimes.
Also remove the HACK and use CurlTimeoutConnect again.
The default is still 10 seconds, but is overridden to be 30 for mesh
now (which needs a reconnect for every mesh, since LL does not support
connection reuse for mesh). Note that I never saw any successful
connect under 8 seconds while I had the connect time out at 30:
Over 8 seconds is a sure fail (except for mesh, where in rare cases
there were connect times of 15 seconds (never 14 or 16).
On quiet servers, the connect time is normally sub-second. This is
the bulk of connections for my own SL use.
2013-07-04 00:02:28 +02:00
Lirusaito
e9ce1a6357
Whoops, source code shouldn't be executable.
2013-07-03 05:49:50 -04:00
Lirusaito
d623fd37cc
Feature Request: Web Search Tab in Legacy Search!
2013-07-03 05:44:48 -04:00
Lirusaito
27145699bf
Update/cleanup llpanelpermissions
2013-07-02 19:05:53 -04:00
Lirusaito
92633b8c65
Solve Issue 907: Build -> Objecttexture -> Searchfield-activation
2013-07-02 04:22:59 -04:00
Lirusaito
e199d5f867
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-07-01 21:13:11 -04:00
Lirusaito
1de076c9c0
Fix two bugs for web search
...
1. When web search was open, because it had no id, it would steal the links clicked for the in-viewer browser, now it identifies as search and will not.
2. Work around an oddity with the browser being unresponsive to certain category only slurls, by temporarily removing the expected behavior of it returning as last seen when reopened (no setVisible(false) in onClose, just close out as normal)
2013-07-01 21:10:06 -04:00
Aleric Inglewood
6ee1bf3fae
Merge remote-tracking branch 'singu/master'
2013-07-02 02:13:03 +02:00
Aleric Inglewood
59716ba86b
Added progress meter in HTTP debug console.
2013-07-02 02:12:34 +02:00
Lirusaito
e0dd871a96
Fix Issue 706: 4000Alpha terrain downloads fail
2013-07-01 16:57:35 -04:00
Lirusaito
4572c556f7
Fix Issue 630: Appareance to XMl don't work
...
Removes the enable callback for Appearance To XML, LL no longer has that hooked in, why should we?
Tested and confirmed to work with or without DebugAvatarAppearanceMessage the same way.
2013-07-01 16:54:29 -04:00
Lirusaito
11c311cd49
Optional V3 Web Search and support for search SLURLs
...
Added "Use web-based search instead of legacy v1 search" checkbox to System->General preferences
Unified all functions to display search floater into toggle_search_floater and LLFloaterSearch::showInstance
Added UseWebSearch and UseWebSearchSLURL debug settings for flexible configurations
- SLURLs with legacy search cannot always present the same results as web
Added SearchURL debug setting, a separate setting from the one used in the all tab, slightly different and always set by response["search"] on OSGrid logins to detect if websearch is supported
Cleaned up llfloaterdirectory includes and added "Search.WebFloater" to the CommitCallbackRegistrar in case we ever want to add a button or something to open web search (couldn't find a nice place for it, sadly), also added more functions to show specific tabs and performQueryOn to search a tab with specific query on LLPanelDirBrowser's
2013-07-01 16:17:46 -04:00
Aleric Inglewood
0353498b9c
Set CURLOPT_FORBID_REUSE for XMLRPCResponder
...
XMLRPCResponder is used to login, which is a HTTP 1.0 server
that doesn't support reuse of connections.
It's cleaner to close connections from our side too.
This changes,
0x7fffdcf93700 CURLIO 0x7fffcd86db40 * Connection #0 to host login.agni.lindenlab.com left intact
into
0x7fffdcf93700 CURLIO 0x7fffcd8b0bd0 * Closing connection #0
2013-07-01 15:44:47 +02:00
Aleric Inglewood
982921e495
Add AICurlTimer - timer support for the curl thread.
...
Not used yet. Deliberately not threadsafe.
Usage the same as AIFrameTimer, upon which is was based.
2013-07-01 15:41:44 +02:00
Lirusaito
609dba3926
Update Floater World Map, add support for worldmap and maptrackavatar slurls (Find on map and show pick on map in web profiles)
...
Cleaned up includes, switched callbacks over to mCommitCallbackRegistrar, updated RLVa portions to RLVa 1.4.5, changed mSLURL from a string to a real SLURL
2013-06-30 15:38:27 -04:00
Latif Khalifa
0e159e47cd
Merge remote-tracking branch 'shyotl/master'
2013-06-28 23:18:39 +02:00
Shyotl
8ccf3a20b3
Fix crash that would happen upon revealing then closing the wl pref panel and then overriding region windlight settings.
2013-06-28 16:11:54 -05:00
Shyotl
8bca439a5a
Fixed layout_panel being incorrectly resizeable in browser floater, and made layout_panel width more consistent in panel_progress.xml
2013-06-28 14:39:13 -05:00
Lirusaito
cf189beb86
Update French vanity preferences and put a name in for a checkbox I'd forgotten to name, thanks Nomade~
2013-06-28 09:12:23 -04:00
Lirusaito
6f701c413a
Remove the makeshift visibility_control from llprefsvoice.cpp in favor of using a real one
2013-06-28 08:25:13 -04:00
Lirusaito
b1abffbce1
Address Issue 879: Ability to copy Group URI
...
Spanish Button Translation from Firestorm
Also: Realigned includes in llpanelgroup.cpp to diff nicer with upstream
2013-06-28 08:22:30 -04:00
Lirusaito
9bdbf6b987
French Translation positioning fix-up from Nomade Zhao
2013-06-28 07:22:05 -04:00
Lirusaito
b7c4532766
Solve Issue 521: Web profile support
...
Adds a checkbox "Use web profiles instead of legacy v1 profiles" to System->General preferences
Adds a button "Web Profile" to the first life tab of legacy profiles (only available on grids that provide a web profile url)
When connecting to an OSGrid, always set the WebProfileURL setting to whatever is in web_profile_url, this way we know if web profiles are not supported.
Borrowed translations of the preference checkbox from Firestorm, translators may want to tweak
Translators may want to update panel_avatar.xml as it now has a web profile button, and contents have shifted slightly.
2013-06-28 07:18:59 -04:00
Latif Khalifa
5cea153542
Consolidate prebuilt libs
2013-06-28 05:49:29 +02:00
Latif Khalifa
34dad3ba04
Merge remote-tracking branch 'shyotl/master'
2013-06-28 05:48:46 +02:00
Shyotl
eab05d49d8
Added [in]visibility_control support.
2013-06-27 22:08:17 -05:00
Shyotl
93ca5d3482
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into Moap
...
Conflicts:
indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
2013-06-27 22:07:31 -05:00
Shyotl
dbf8845834
Fixup active speakers floater
2013-06-27 20:21:32 -05:00
Shyotl
54bf2943be
Use proper list column when when generating teleport url from teleport history list.
2013-06-27 20:11:34 -05:00
Lirusaito
de97a7c9f7
Add floater_media_settings.xml to translations, and fix its title to fit in with the other floater titles
2013-06-27 18:58:01 -04:00
Latif Khalifa
321a7ffbd4
Merge remote-tracking branch 'aleric/master'
2013-06-28 00:12:57 +02:00
Lirusaito
a31316f46a
By default, retain the expected behavior of not showing quick settings expanded
2013-06-27 18:11:54 -04:00
Aleric Inglewood
33e275c999
Temporary hack to easy the mesh connect timeout problem.
2013-06-28 00:09:10 +02:00
Aleric Inglewood
f74ad5eafa
Fix global connection threshold not to count non-approved queued request as being in the pipeline.
...
This make more sense when comparing the threshold against 2 times the
maximum allowed total connections.
As a result, textures won't stall when there are around 128 mesh
requests queued.
2013-06-28 00:09:10 +02:00
Aleric Inglewood
73ea6eb80e
Rewrite of AIPerService::add_queued_to
...
This should fix any 'stalls' with zero added requests for mesh.
2013-06-28 00:09:09 +02:00
Latif Khalifa
7855071ce8
Merge remote-tracking branch 'lirusaito/VoiceUpdate'
2013-06-27 23:31:46 +02:00
Lirusaito
f6a1371f70
Fix the issue with the doubleclick callback for the script compile errors list breaking when the user has opted not to let script errors steal focus
2013-06-27 17:27:55 -04:00
Lirusaito
fe238d0563
Delete all the fake toolbar icons in alternative skins
...
The proper way to hide toolbar icons is by falling back on the default skin's 1x1 transparent texture for them, not by making a a larger version of the icon and using that.
This should fix the awkwardly offset alignment of the text on the buttons in these skins
2013-06-27 13:51:43 -04:00
Lirusaito
e07581f14d
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2013-06-27 06:00:21 -04:00
Drake Arconis
258d39e432
Coffee time.
2013-06-27 05:57:36 -04:00
Drake Arconis
d00fca05e9
Cleanup from review
2013-06-27 05:39:04 -04:00
Lirusaito
198091c2a0
Solve Issue 738: Improve .anim upload floater
2013-06-27 02:31:42 -04:00
Lirusaito
19367b517c
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
...
Conflicts:
indra/llui/lluictrl.cpp - Silly mergestuffs
indra/newview/llfloatermediabrowser.cpp - deleted
indra/newview/llpanellogin.cpp - updated functions went poof
Compile Fixies:
indra/newview/llfloaterwater.cpp - I missed a spot with notificationsutil, it seems.
2013-06-26 12:37:31 -04:00
Lirusaito
f6df34e40a
Remove mCommitCallback, mValidateCallback, and mCallbackUserData and related functions from LLUICtrl and derived classes
2013-06-26 11:16:44 -04:00
Lirusaito
d7d5925fd1
And finally, update the callbacks on the last few panels to use boost
...
Cleans up LLPanelSkins enough to remove sInstance hack.
Modernizes some callbacks on wlfPanel
2013-06-26 11:14:32 -04:00
Lirusaito
14736d24a5
Update LLFloaterWater and LLFloaterWindLight, to be closer to their upstream counterparts.
2013-06-26 09:07:34 -04:00
Aleric Inglewood
32681403c6
Fixed a typo: mConcurrectConnections -> mConcurrentConnections
...
That's what you get for only copy&pasting variable names.
2013-06-26 13:23:10 +02:00
Lirusaito
dbe646c943
Some minor tweaks to llfloaterpostprocess
...
Just to make it a little nicer and cleaner, a few changes are from upstream.
2013-06-26 05:32:57 -04:00
Lirusaito
32dc35d582
Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
...
Conflicts:
indra/newview/lloverlaybar.cpp - Shyotl did some caching, VoiceUpdate turned LLVoiceClient::voiceEnabled non-static.
indra/newview/llvoiceclient.cpp - Change actually belongs in llvoicevivox.cpp
2013-06-26 04:43:46 -04:00
Lirusaito
5a9a0e0b1b
Upload code cleansing
...
I found our upload classes were in need of a tune up while researching Issue 896: Animation upload setting causes viewer crash
So I started working to clean up llfloaterbvhpreview which lead me to llfloaternamedesc and the rest of our upload floaters
I ended up pulling the sound upload hack out of LLFloaterNameDesc and into LLFloaterSoundPreview and moving LLFloaterAnimPreview into llfloaternamedesc.*
Updated llviewermenufile.cpp a bit
Removed setUploadAmount from LLFloaterImagePreview and LLFloaterBvhPreview as its purpose is served by LLGlobalEconomy::getPriceUpload and the hippogridmanager too.
Fixed an issue with floater_animation_anim_preview.xml using [AMOUNT] instead of [UPLOADFEE] for its label.
I'd say this might fix Issue 896, I certainly can't reproduce the crash I was having when testing for it anymore.
2013-06-26 03:51:27 -04:00
Shyotl
84d76f437f
Toggle chat_bars parent layout panel instead of the actual chat bar. Fixes layout stack collapse not working. Also, cache a few more things in LLOverlayBar (reduces per-frame setting lookups, etc). Also added debug rect drawing for layout_stack/layout_panel.
2013-06-26 02:14:13 -05:00
Lirusaito
5aaea47a81
Removed setCallbackUserData calls from the last few newview files
2013-06-25 23:54:09 -04:00
Lirusaito
139a10e77c
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
...
Conflicts:
indra/newview/llpanelface.* -Knew these would conflict just from proximity
2013-06-25 23:49:04 -04:00
Lirusaito
8fb8e74e54
Fix the crash upon hitting select for an object's light color feature
...
Modernizes LLTextureControl(, LLFloaterTexturePicker) and LLColorSwatch
Updates LLPanelVolume, LLPanelObject, and LLPanelFace to prevent related crashes and compile.
Adds translation string InventoryNoTexture to strings.xml (added to all existing translations from upstream translation)
2013-06-25 23:02:15 -04:00
Lirusaito
c2cc398339
Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
...
Conflicts(Actually git being dumb, I already merged these, just lost history):
indra/newview/llfloateractivespeakers.h - local
indra/newview/lloverlaybar.cpp - local
indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote
2013-06-25 19:37:50 -04:00
Shyotl
2793ca9e04
Applied moap beacon patch.
2013-06-25 16:21:51 -05:00
Shyotl
e011517849
Widen login/teleport progress bar. Fixed toolbar/overlaybar appearing over login progressview. Updated progressview a bit. Added drawcontext alpha support to llprogressbar. Fixed issue with prim media control panel blocking mouseclicks on upper portion of on-prim media.
2013-06-25 10:29:48 -05:00
Lirusaito
306df58793
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
2013-06-24 14:22:36 -04:00
Latif Khalifa
26aea5f16e
Merge remote-tracking branch 'aleric/master'
2013-06-24 19:42:50 +02:00
Aleric Inglewood
58972a1f87
Bug fix and improvement (HTTP debug console)
2013-06-24 19:12:37 +02:00
Aleric Inglewood
1d04b4af24
Actually use CapabilityType::mConcurrentConnections for Approvements.
2013-06-24 18:57:42 +02:00
Aleric Inglewood
719f57e00d
Fix documentation at top of AIPerService::approveHTTPRequestFor
2013-06-24 18:37:57 +02:00
Aleric Inglewood
6c36b6efa0
Add AIPerService::mCTInUse and AIPerService::mUsedCT
...
Keep track of which capability types are used and in use
at the moment for each service.
Update the http debug console to only show services
that have at least one capability type marked as used (this resets upon
restart of the debug console) and show previously used but currently
unused capability types in grey.
Update CapabilityType::mConcurrentConnections based on usage of the
capability type (CT): Each currently in-use CT gets an (approximate)
equal portion of the available number of connections, currently
unused CTs get 1 connection for future use, so that requests can and
will be added to them if they occur. If a CT is currently not in use
but was used before then it's connection (but at most one connection)
is kept in reserve. For example, if there are 8 connections available
and a service served textures and mesh in the past, but currently
there are no texture downloads, then mesh get at most 7 connections,
so that at all times there is a connection available for textures.
When one texture is added, both get 4 connections.
2013-06-24 16:13:00 +02:00
Lirusaito
45bbf52771
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
2013-06-23 22:36:55 -04:00
Lirusaito
3739639295
Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
...
Conflicts:
indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel
indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two.
Compile fixies:
indra/newview/llavataractions.cpp needed to include llnotifications.h
indra/newview/llvoicechannel.cpp needed to include llnotifications.h
2013-06-23 22:36:04 -04:00
Lirusaito
7a88b9a8a4
Fix the issue reported in group chat in which closing preferences with Device Settings open does not return to local voice
2013-06-23 22:16:40 -04:00
Lirusaito
64bd7af0ca
Update childSetCommitCallback to upstream version, fixes the issue of crashing out upon using spinners in the colorpicker
2013-06-23 22:14:35 -04:00
Lirusaito
64cb1109e2
Update/Modernize LLFloaterColorPicker
...
Not very important, just something I did while working on the related spinner bug..
This actually fixed the crash when using the hex editor field.
2013-06-23 19:07:27 -04:00
Lirusaito
9f3c4e909a
Removed the need for LLPanelAvatarNotes::onCommitNotes with a bind
2013-06-23 19:01:39 -04:00
Lirusaito
b4f0b29035
Switched the Ascent Prefs callbacks over to modern boost::bind
...
It's simple to compile fix, but I'll handle any necessary merge conflicts, if necessary.
Hunspell stuff needs revisiting still, works as poorly as it always did.
2013-06-23 19:00:49 -04:00
Aleric Inglewood
af9018f35f
Add AIPerService::CapabilityType::mConcurrectConnections
...
Prepares for throttling number of connections per capability type.
The value is current left at AIPerService::mConcurrectConnections,
so not having an effect yet.
2013-06-23 18:09:09 +02:00
Aleric Inglewood
87176418a2
Change CurlConcurrentConnectionsPerService to U16 and clamp it between 1 and 32.
...
Also fixes a bug where going from 1 to 2 would not update
AIPerService::mConcurrectConnections correctly.
2013-06-23 18:05:23 +02:00
Lirusaito
498b63be99
Revert "Fix the issue reported by Beware Hax in which the group name text is missing from build floater."
...
This reverts commit 142e8fff19 .
Shyotl fixed this in Moap, which I am about to merge.
2013-06-23 04:25:55 -04:00
Lirusaito
e7669cc94b
Add setting to prevent script errors from stealing focus
2013-06-23 04:05:25 -04:00
Lirusaito
d4bed6382c
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
2013-06-23 02:25:15 -04:00
Shyotl
67df523f10
LLChatBar can't betreated as a LLPanel and a LLLayoutPanel at the same time. Demoted to just an LLPanel (fixes issues with follow attribute).
2013-06-22 17:27:09 -05:00
Aleric Inglewood
ee59617c5e
Always add new http requests to the back the queue.
2013-06-22 22:20:37 +02:00
Aleric Inglewood
8a825c4228
Merge remote-tracking branch 'singu/master'
2013-06-22 20:09:45 +02:00
Aleric Inglewood
432d6b5697
More comment fixes to refer to services instead of hostnames.
2013-06-22 20:08:15 +02:00
Drake Arconis
dde335da2d
Fix button misalignment in gemini skin
2013-06-21 03:23:53 -04:00
Drake Arconis
43a7cbaa85
Rip out the globals :D
2013-06-21 03:23:52 -04:00
Drake Arconis
7a0e3d8abd
Remove more old stuff
2013-06-21 03:23:51 -04:00
Lirusaito
62f5e73767
Copypasta went stale, I had to throw it out.
...
This commit removes the hardcoded see avatars text that replaced the label of the checkbox on the about land floater regardless of conditions.
Also adds the checkbox translation from v3 for Portuguese.
2013-06-20 22:43:41 -04:00
Shyotl
3f1e67d9df
Added LLMediaCtrl rightclick context menu. Also added some v3-esque xml handling for menus (*.on_visible, *.on_enable, *.on_click).
2013-06-20 03:15:42 -05:00
Shyotl
57ba76825c
Made LLPanel::initPanelXML virtual and override it in LLLayoutPanel. Fixes issue with some panels /still/ being user resizeable if derived from LLLayoutPanel and built from an arbiturary sub-xml file.
2013-06-20 00:55:07 -05:00
Shyotl
f24fe44df8
wlfPanel_AdvSettings cleanup. Removed some duplicate code, and register to rlv to catch behavior change instead of polling every draw call. Also now references wlfAdvSettingsPopup setting only during build.
2013-06-20 00:49:02 -05:00
Shyotl
e015771c64
Pulled llnotifications.h dependency from LLFloater. llnotifications.h includes llevents.h, which can cause conflicts with llevent.h (Legacy events vs non-legacy)
2013-06-20 00:45:12 -05:00
Latif Khalifa
788ea1316f
Fix build on arch where python 3 is default
...
Patch by Jimmy Buse
2013-06-20 02:59:04 +02:00
Latif Khalifa
ca42589a82
SH-4274 FIX Adding RegionHandshakeReply flags for SSA
...
Adding a flag to hint to the sim that this viewer knows how to handle
AvatarAppearance messages for self in SSA-enabled regions.
Upstream patch: 5fdc790f6d
2013-06-19 17:37:40 +02:00
Latif Khalifa
859ad8efd8
Merge remote-tracking branch 'melanie_t/master'
2013-06-19 16:57:28 +02:00
Melanie
94cfa613ec
Rename inner scope floater var to satisfy MSVC
2013-06-19 16:54:41 +02:00
Melanie
76219cd459
Fix the Octopus to hold on to connections and to disconnect them using boost rather than setting a zero callback.
2013-06-19 16:08:47 +02:00
Shyotl
8d0a514712
Added missing setting. Fixed login grid combobox. Using skin-dependent scrolllist text color in nearbymedia panel. Fixed media face toggle not triggering face rebuild. Added incon that was missed in previous commits. bar_stack layout panels were incorrectly resizeable. Fixed comboboxes/scrolllists in panel_nearby_media.xml translations
2013-06-19 03:32:33 -05:00
Lirusaito
2c1f14e27f
AscentMutedColor is not in gColors, it's a setting, oops. Thanks to LaMont Zuzu for helping me sort this all out.
...
Fixes muting people who are/having muted people who are in a participant list(active speakers or that << pop out in group chats) that is displayed
2013-06-18 21:01:11 -04:00
Shyotl
49cbc80ee0
Added 'NearbyMedia' floater (accessable via new button in Media Remote popup)
...
-Floater utilizes a slightly modified LLPanelNearbyMedia, which has fading and the 'minimal' mode disabled when its parent is a floater.
-Due to how LL designed LLPanelNearbyMedia, only one instance should ever be allowed at a time.
Added LLNameBox. To avoid having dupilcate code, logic in LLTextBox::fromXML had to be moved to LLTextBox::initFromXML.
-Perfomed some additional cleanup. 'name' attribute now parsed in LLUICtrl::initFromXML, or as-needed for elements not based off of LLUICtrl.
LLSlider now respects current DrawContext
Fixed the AO toolbar widget reserving too much width.
Made the "wlfAdvSettingsPopup" setting persist, and un-inverted its logic.
Altered ui initilization order. Toolbar/overlay panels now constructed further into login process.
2013-06-18 08:09:17 -05:00
Lirusaito
3116e4923c
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-06-18 01:18:28 -04:00
Lirusaito
12a23c98a1
Fix Issue 459: Appearance, Create Outfit does not keep edits to outfit - HAPPENS EVERY TIME
...
Automatically detach copyable attachments early, so that changes will be kept (LLMakeOutfitDialog was changed to update the outfit correctly, despite items being removed. It should probably be cleaned up further)
Adds an extra checkbox to make outfit dialog to disable this new auto-detach behavior, for users who rely on the old behavior.
Also fixes a bug I noticed in LLMakeOutfitDialog in which the use links checkbox would be enabled even if the grid doesn't support links
Had to reposition everything to get the new checkbox to sit nicely, but in doing so changed bottoms to bottom_deltas so it should be easier in the future, layout remains the same, of course, shouldn't be noticed.
2013-06-18 00:02:50 -04:00
Latif Khalifa
55ab1429af
Merge remote-tracking branch 'aleric/master'
2013-06-18 03:34:07 +02:00
Latif Khalifa
4607ff1317
Merge remote-tracking branch 'lirusaito/master'
2013-06-18 03:33:55 +02:00
Lirusaito
4016c9d756
Silly profiles, display the proper title.
2013-06-17 12:37:22 -04:00
Aleric Inglewood
ff6e25b342
Compile fix
2013-06-17 17:59:39 +02:00
Lirusaito
f27f4a7d48
Minor LLViewerTextEditor update
...
Support for opening embedded calling cards
Switched to llnotificationsutil.h instead of llnotify.h
Cleaned up and reorganized includes list to better match upstream
Fixed embedded notecards not popping up when you click them, someone at LL decided new inventory should only be shown if the user doesn't want it to be shown for the case of embedded notecards.
2013-06-17 11:34:48 -04:00
Aleric Inglewood
1754b97e5c
Need to export BackTrace::S_Number to use BACKTRACE.
2013-06-17 17:28:42 +02:00
Shyotl
884c67e641
Added LLViewDrawContext. Implemented in a few select ui elements. Just enough to support the panel prim media controller fading out all fancy-like.
2013-06-16 22:48:50 -05:00
Shyotl
10f61f6f00
Old habits die hard. Fix gcc compile.
2013-06-16 22:45:48 -05:00
Shyotl
d4f5c25612
Fix up some of the broken SLURL<->HippoGridManager logic.
2013-06-16 21:47:55 -05:00
Lirusaito
7303bfcb78
Eliminated most instances of the legacy setCallbackUserData (and modernized up a bunch of callbacks)
...
Also cleaned up slfloatermediafilter to act as a proper singleton.
Removes childSetUserData entirely.
2013-06-16 20:00:00 -04:00
Melanie
6025af25be
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-06-16 20:49:54 +02:00
Lirusaito
4fe2396203
Relicensed LLDropTarget to LGPL, since I've rewritten it.
2013-06-16 01:13:52 -04:00
Shyotl
be94087bee
Fixed a focus issue that prevented face media floater from updating on face change if said floater had current focus.
2013-06-15 20:08:05 -05:00
Lirusaito
93ce490ba3
Forgot to update the search floaters used on alternate grids
2013-06-15 18:36:56 -04:00
Lirusaito
657d3f704c
Add Open Picture button to Pick Panels (and Further LLPanelPick cleanup)
2013-06-15 18:34:14 -04:00
Shyotl
ad89c3e401
Added media support to prim face editor. Todo: Translations for all these floaters and panels.
2013-06-15 05:14:27 -05:00
Lirusaito
c5d21cfb1c
Updated pick panel code, removed dead stuff including xmls.
2013-06-15 06:10:31 -04:00
Lirusaito
8ce71811c5
Feature Request (from IRC): Allow less restrictive access to group profiles from search
...
mAllowEdit has really signified whether or not llpanelgroup was in its own standalone floater
This change removes the restrictions the lindens chose to put on group search, allowing the user as much control as possible over a group from outside a dedicated floater
Notices and Land & Money get their information from messages passed through viewermessage, addressed to the right instance by id, as such they must be unique to the standalone floater
Cancel button in group search will only enable when changes have been made and will refresh the group, clearing changes.
The OK button is not visible in group search as it serves the same purpose as the Apply button here.
2013-06-14 23:08:56 -04:00
Lirusaito
cf675c3748
Feature Request (from IRC): Add option to display complete name on profile (Available on Vanity Preferences at the bottom of the main tab)
...
Note: This will not work with legacy names selected because that disables the display name system altogether right now, if we ever separate the disabling to another setting, this would work.
2013-06-14 22:04:27 -04:00
Lirusaito
35bcf34f06
Removing unused panel_group_finder.xml, looks like some ancient version of panel_group.xml
2013-06-14 14:49:24 -04:00
Latif Khalifa
8574f1ee23
Merge remote-tracking branch 'aleric/master'
2013-06-14 18:31:48 +02:00
Latif Khalifa
a6a5983fbe
Merge remote-tracking branch 'lirusaito/master'
2013-06-14 18:31:35 +02:00
Latif Khalifa
4552c5f878
Merge remote-tracking branch 'melanie_t/master'
2013-06-14 18:31:23 +02:00
Shyotl
5f4091b4d2
Update LLFloaterTools to use commit callback registrar where convenient.
2013-06-14 03:55:40 -05:00
Shyotl
9d0f7bacfc
Tweak focus handling so media faces behave properly, and tweaked tooltip handling for media faces.
2013-06-13 20:10:24 -05:00
Lirusaito
c8427e1c63
[Voice Update] Remove old xmls from back when the voice setup wizard was a thing
2013-06-13 08:56:12 -04:00
Lirusaito
2d71b9be17
[Voice Update] LLPanelVoiceEffect added to LLFloaterActiveSpeakers
...
Comments out xml menu entry for LLFloaterVoiceEffect access from LLPanelVoiceEffect is the intended method
TODO: Once Shyotl's new layout stack code comes in, make LLFloaterActiveSpeakers into a vertical stack so we can properly hide LLPanelVoiceEffect upon a debug setting.
2013-06-13 06:29:00 -04:00
Shyotl
dceb1a64fe
Added mouse entry/mouse leave ui callback support. Works manually or through CommitCallbackRegistry (*.mouseenter_callback & *.mouseleave_callback attributes)
2013-06-13 04:33:49 -05:00
Shyotl
e617ff0763
New LLLayoutStack, and cursory LLPanelPrimMediaControl panel.
2013-06-13 04:28:15 -05:00
Lirusaito
01ec6905ab
[Voice Update] LLFloaterVoiceEffect (Lives in File->Show Voice Morpher for now)
2013-06-13 05:23:35 -04:00
Aleric Inglewood
34b921a101
Disable llassert(!mUploadFinished)
...
This fires so little that it isn't worth anymore to look into it
(the only problem resulting from this is a wrong timeout on one
of the http requests); and therefore no longer makes sense to
have it triggered in alpha builds at all, since those do not
produce enough debug output to understand what caused it in the
first place.
2013-06-12 21:21:41 +02:00
Aleric Inglewood
af1eaac79d
Bug fix.
...
Revert an incorrect change made in
c5fc945f33 (imported from viewer 3).
This stops ASSERT(mSegments.back()->getEnd() == getLength())
in LLTextEditor::loadKeywords.
2013-06-12 14:55:46 +02:00
Aleric Inglewood
def40055b0
Don't add windows filesname to service list.
2013-06-12 03:10:11 +02:00
Lirusaito
08ab202a06
Fix avatar "inspect" commandhandler
2013-06-11 19:03:15 -04:00
Lirusaito
b7136b2b4f
[Voice Update] startCall and endCall use Session UUID, not Other Participant UUID.
2013-06-11 16:59:32 -04:00
Lirusaito
7e9c75ef6b
Use the translatable string Saved_message everywhere needed, instead of just one place.
2013-06-11 15:43:27 -04:00
Lirusaito
d947912bb0
[Voice Update] Start/End call functions
...
Adds llvoicecallhandler.cpp
Enables the Group and Avatar Actions requiring the voice refactor.
Adds autoStartCallOnStartup, processAgentListUpdates, startCall, and endCall to LLIMMgr.
Gives llimpanel some LLIMModel functionality to see if a floater was opened with the intent of being a call.
Cleans up LLIMPanel with new functions from the voice refactor.
2013-06-11 15:41:53 -04:00
Lirusaito
fd453593b3
Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
...
Conflicts:
indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
indra/newview/llfloaterobjectiminfo.cpp - simple merge
indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
indra/newview/llviewermedia.cpp - includes conflict, simple stuff.
SLURL update:
indra/newview/llavataractions.cpp
indra/newview/llgroupactions.cpp
2013-06-11 15:32:18 -04:00
Lirusaito
9ffd531ce6
Missed a spot
2013-06-11 09:41:33 -04:00
Lirusaito
8a37ac2439
class LLOfferInfo update
2013-06-11 07:36:49 -04:00
Lirusaito
62a96b8b33
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into VoiceUpdate
2013-06-11 05:56:24 -04:00
Lirusaito
c8657504f6
Fix WARNING: LLNotificationTemplates::addTemplate: LLNotifications -- attempted to add template 'LandBuyAccessBlocked' twice.
2013-06-10 11:49:03 -04:00
Aleric Inglewood
aca39d8c11
Fix crash when granting/removing build rights to others.
...
Bug was introduced in c701c61566
for single persons, but already existed for when granting rights
to more than one person at a time.
There is still a problem left now that you have to confirm
several times (once, but also had to confirm two or three times)
before it gets through. That doesn't seem related to THIS bug,
but seems to be a new bug, possibly introduced in the same commit
mentioned above.
2013-06-10 16:07:45 +02:00
Lirusaito
cc107c55cd
[Voice Update] Fix the current voice chat button
...
If the current voice chat's floater is undocked, grab it by session id so that it's not labeled blank
When the button is clicked, open the current voice chat floater, not the communications floater, this is the intended action.. how it should have acted in the first place.
2013-06-09 11:32:51 -04:00
Lirusaito
cbfa47c0da
[Voice Update] LLPanelActiveSpeakers to LLParticipantList
...
Minor updates to code, mostly just a migration with some v3 stuff commented, since we don't have LLAvatarList and must use buttons since scrolllist menus don't actually exist nicely yet.
Added toggleMuteVoice and isVoiceMuted to LLAvatarActions
Added a minor touch to the voice volume slider, it'll now offer changing your own volume while in an active voice session.. nice to not drop out of an import voice session just to fix yourself.
Also, fix a bug with SpeakerMgr's not flagging speakers for removal properly, causing external speakers and speakers managed by LLActiveSpeakerMgr to never actually get removed.
2013-06-09 11:28:49 -04:00
Aleric Inglewood
e59cefa0cc
Bug fix of LLPipeline::setRenderDebugFeatureControl
...
This commit has no effect on how the viewer behaves currently.
2013-06-07 16:19:46 +02:00
Shyotl
72c186f0f4
Fixed some unused variable warnings/errors when not compiling with assertions enabled. (eg 'release' configuration). Also snagged a nullcheck from upstream.
2013-06-06 02:12:45 -05:00
Lirusaito
fc07727281
[Voice Update] Minor update to llvoicechannel class
...
Incompatible things left in from upstream are commented out
Just need to wrap things up to a point.
2013-06-04 23:27:18 -04:00
Shyotl
909fc0d9ce
Blah blah fix non-windows builds.
2013-06-04 17:08:59 -05:00
Lirusaito
89963b018b
[Voice Update] llfloateractivespeakers.* to llspeakers.*
...
Condenses the three moderation responders to one.
Adds Speakers settings.
Uses dedicated timer class to track speakers on the list
Adds temporary getSpeakerManager() function to LLFloaterIMPanel to play the role of LLIMModel::getSpeakerManager
2013-06-04 10:18:49 -04:00
Shyotl
3a7955192e
Temporary super-obsessive audioengine debugging/diagnostics.
2013-06-04 04:39:51 -05:00
Shyotl
821fd1f7d6
Handle fmodex internal channel release by registering channel callbacks. Harden channel<->source associations. Assign console output for audio system "AudioEngine" and "AudioImpl" tags. Added base LLAudioChannel::cleanup() vfunc to handle non-impl-related variable cleanup. Killed some redundant code.
2013-06-04 03:46:26 -05:00
Lirusaito
c273e34ed8
[Voice Update] LLVoiceClient
...
Migrate a bunch of classes out of llvoiceclient.* and into new llvoicevivox.*
Update most of these to match their counterparts
Introduce VoiceFonts support (voice morphing, floater still to come)
Support for a bunch of v3 voice settings.
Move volume settings management from LLMutelist into LLSpeakerVolumeStorage
Support for Avaline mutes (WIP)
Adds voice section to LLAgent
Moved llfloatervoicedevicesettings to llpanelvoicedevicesettings, v3's voice device panel design is more intuitive.
2013-06-03 22:20:27 -04:00
Aleric Inglewood
c5489932cf
Fix ASSERT(!mUploadFinished || mBeingRedirected)
...
Hopefully this is the last case.
2013-06-04 00:31:44 +02:00
Shyotl
9c8cfcfd0a
Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent).
2013-06-02 23:47:47 -05:00
Melanie
b8cc9a7c04
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-06-03 03:28:36 +02:00
Melanie
f497a8a3d5
Fox the Octopus break I caused
2013-06-03 03:27:25 +02:00
Latif Khalifa
edf8c337ee
Silence warnings, LLOfferInfo is a struct for now
2013-06-03 02:02:11 +02:00
Latif Khalifa
d4431e14d7
Merge remote-tracking branch 'lirusaito/master'
2013-06-03 01:36:35 +02:00
Latif Khalifa
986871c5a6
Merge remote-tracking branch 'aleric/master'
2013-06-03 01:33:03 +02:00
Latif Khalifa
5ee7244b45
Merge remote-tracking branch 'shyotl/master'
2013-06-03 01:30:36 +02:00
Shyotl
07165961dc
Handle "indeterminate" login response (indicating login server redirection). (This changeset will conflict in a future merge. Prefer this commits changeset where there's overlap)
2013-06-02 17:51:17 -05:00
Lirusaito
07e1b5c3b9
[Voice Update] Remove gVoiceClient occurrences in favor of using LLVoiceClient as a Singleton everywhere.
2013-06-02 01:34:03 -04:00
Lirusaito
b6096720b1
[Voice Update] Break out llvoicechannel.* from llimpanel.*
2013-06-01 22:47:41 -04:00
Aleric Inglewood
24fb76907d
Compile fix
2013-06-01 16:37:02 +02:00
Aleric Inglewood
98badb94da
Add AIHTTPView, a HTTP Debug Console - press Ctrl-Shift-7
2013-06-01 16:14:32 +02:00
Aleric Inglewood
5c05a04a2c
Fix of 'LLError::NoClassInfo::~AIFilePicker: Calling AIFilePicker::~AIFilePicker()'
2013-06-01 13:32:55 +02:00
Shyotl
c2cc65ecdc
Removed dead STATE_LOGIN_AUTHENTICATE login state, and added login redirect response ('indeterminate').
2013-06-01 05:13:56 -05:00
Shyotl
d4a545fb16
More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs.
2013-06-01 05:11:18 -05:00
Lirusaito
e27914a57e
RLVa update
2013-06-01 02:49:21 -04:00
Lirusaito
a06a6f4624
Remove randgauss.h, it hasn't been used since before 1.6.0
2013-06-01 02:23:36 -04:00
Lirusaito
142e8fff19
Fix the issue reported by Beware Hax in which the group name text is missing from build floater.
2013-05-31 21:31:07 -04:00
Lirusaito
6b03d2ddae
Dummy Views in PanelPermissions
2013-05-31 21:16:52 -04:00
Lirusaito
9d6d82c4a0
GroupActions fixup.
...
Missed a tiny spot for displaying group notifications in profile, slipped by me.
2013-05-31 21:04:14 -04:00
Lirusaito
9dc99d0b08
Update keywords.ini in skins to match c5fc945f33 changes
2013-05-31 17:31:18 -04:00
Aleric Inglewood
98eecb319a
Merge remote-tracking branch 'singu/master'
2013-05-31 20:02:50 +02:00
Aleric Inglewood
34e0398ddf
Fix of issue 855 #12 second image.
...
This should fix 'Received 302 (Moved Temporarily) for responder
"AgentStateResponder" which has no followRedir().
Some responders want to deal with redirections themselves, I checked if
this (new, pathfinder related) responder wants that in viewer-release,
but it doesn't. Turning this on requires to also keep track of cookies,
so it's a bit slower and therefore left at the old default: to not let
curl follow redirections. Optionally we would turn it on by default and
explicitely off for those responders that want to deal with 302's
themselves and for those that really don't need it and are used most
heavily.
2013-05-31 19:52:23 +02:00
Lirusaito
fcd6f217d2
LLGroupActions too! (Strengthens RLVa restrictions!)
...
Cleans up llfloatergroupinfo, makes it an instance tracker... pretty much as nice as llfloateravatarinfo now ^*^
Adds notifications JoinGroupNoCost and JoinedTooManyGroups (added to our existing translations, of course)
Cleans up all around, placing groupactions around.
Touches up bits for avataractions
2013-05-31 07:37:00 -04:00
Shyotl
ef3e918558
Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!
2013-05-31 05:33:41 -05:00
Shyotl
a8b2a10c61
Switch pie menu over to ui-local transform matrix stack.
2013-05-31 04:46:38 -05:00
Siana Gearz
06c286a8a8
Merge commit '6ef3ba4e113a4f87440f0ad3cafb348383c61504'
2013-05-31 11:07:51 +02:00
Siana Gearz
746f1236d5
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-05-31 10:54:31 +02:00
Siana Gearz
9b31bd9ad6
Fix inventory move logic
2013-05-31 10:54:17 +02:00
Lirusaito
8d10a21a7a
One more fix for removing system folders, thanks Swiftkill!
2013-05-30 19:56:49 -04:00
Lirusaito
59e7b1c777
Touchups to deleting system folders, now use DELETE_SYSTEM_FOLDERS instead of not LL_RELEASE_FOR_DOWNLOAD, and bypass the folder protection check if this is the case.
2013-05-30 19:29:27 -04:00
Lirusaito
dc4a52e1c4
Added Delete System Folder entry to xmls, it won't work on release builds, of course.
2013-05-30 18:30:06 -04:00
Lirusaito
f3f76c280b
[Issue 850] Add a control for unfocused window opacity.
...
Adds debug setting FloaterUnfocusedBackgroundOpaque
Adds "Make unfocused floaters opaque" to Vanity->Main preferences.
One line patch to llfloater.cpp
2013-05-30 18:28:36 -04:00
Lirusaito
a395e2f1b9
Removed the profile tab container gap.
2013-05-30 17:02:56 -04:00
Lirusaito
c701c61566
LLAvatarActions all hooked up!
...
Rlva style~ So update to RLVa stuff!
Adds support for @startim and @startimto
Enables hasOpenIM and hasOpenProfile, Yay functionality!
RLV_BHVR_STARTIM and RLV_BHVR_STARTIMTO added
While I was working, I was updating LLAgentHandler, after long enough it was identical enough to the one in llpanelprofile, so we're using that now.
Cleans up llfloateravatarinfo to the point of being a floater and instancetracker wrapper for a panelavatar (profile panel)
Bypasses looking up expired names that we know via get, this should avoid chats (and profiles, but that bug never got out) never opening for people we already know the name of on a bad connection; of course, this will only cause a faster reaction on the UI's part, messages may never get sent still (and profiles may never load) if the connection is truly terrible.
Cleans up llfloaterfriends and some parts of llfloateravatarlist (avatarlist could be cleaned up more from this perhaps in the future)
May slightly look better with copy detection and without space changes..
llgivemoney.cpp changes fix up some dummy view warnings I noticed while testing these changes
llpreview.cpp changes avoid segfault caused by llfloateravatarinfo not being a preview anymore but being inside a multipreview nonetheless.
Translators, don't worry, I covered this one with updates from v3 (Except German team)
2013-05-29 23:56:33 -04:00
Aleric Inglewood
dc265ff9a1
Attempt to fix issue 848
...
https://code.google.com/p/singularity-viewer/issues/detail?id=848
If advance_state is called, then the state is NOT changed (only
sub_state_w->advance_state is set), but sub_state_w->skip_idle is set to
true in order to ignore the next call to idle (if the state machine is
already in the middle of executing a state). Therefore, this assert
would trigger. The solution is to not trigger when skip_idle is set.
2013-05-29 02:37:48 +02:00
Lirusaito
6ef3ba4e11
Definitely avoid IMs never opening from friends list, and attempt to look up friend names we don't have to prevent this "waiting" chat session problem.
...
The const LLRelationship* info was likely null at times, or names weren't looked up, we just failed silently and played the start IM sound as though nothing had happened, this won't happen anymore.
2013-05-28 17:38:58 -04:00
Aleric Inglewood
48677d348f
Fix issue 679
...
https://code.google.com/p/singularity-viewer/issues/detail?id=679
Instead of making the cursor just always an arrow, I changed the
'working' cursor from a watch to an arrow + hour glass. Note that the
BMP of the 'wait' cursor was exactly the same as the 'working' cursor,
so if anywhere 'working' should NOT have an arrow, then that should be
replaced with the UI_CURSOR_WAIT to restore the old cursor.
Obviously, the blinking is fixed too - cause that is what this all was
about.
2013-05-28 03:59:35 +02:00
Siana Gearz
1734370682
Merge branch 'master' of https://github.com/lkalif/SingularityViewer
2013-05-28 03:31:52 +02:00
Siana Gearz
dd82997076
Merge branch 'UICleanup' of https://github.com/Shyotl/SingularityViewer
2013-05-28 03:30:50 +02:00
Siana Gearz
0f90991533
OS X build fix
2013-05-28 03:24:12 +02:00
Shyotl
641ada030e
Didn't actually want to commit the latter ui-scale related change, but rebasing is too annoying, so revert.
2013-05-27 19:23:36 -05:00
Shyotl
ba9c8f3d6d
Merge branch 'master' into UICleanup
2013-05-27 19:19:38 -05:00
Shyotl
d5e1a0dd4b
Unbreak ui scaling.
2013-05-27 19:18:47 -05:00
Shyotl
00269e8358
Unbork ui scaling.
2013-05-27 19:18:11 -05:00
Latif Khalifa
fc80adaf7a
Remove duplicates in the list of files passed to NSIS
2013-05-28 01:42:38 +02:00
Lirusaito
ee1f1cdde2
Use isNull instead of checking equal to LLUUID::null in hbfloatergrouptitles
2013-05-27 08:11:09 -04:00
Lirusaito
6b83dd5210
LLPanelDebug isn't doing anything, it goes poof.
2013-05-27 08:10:12 -04:00
Lirusaito
4eae554812
Merge branch 'UICleanup' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llappearance/llwearable.h
indra/llui/llcombobox.h
indra/newview/jcfloaterareasearch.cpp
indra/newview/jcfloaterareasearch.h
indra/newview/llpanelgrouproles.cpp
indra/newview/llpanelgrouproles.h
indra/newview/llviewermenu.cpp - Plugged in new MenuFloaterDict for AssetBlacklist and SoundExplorer in menu_viewer.xml and removed the old listeners for them.
indra/newview/skins/default/xui/es/floater_inventory.xml
Compile Fixes:
indra/llcommon/llstl.h - error: expected nested-name-specifier before ‘const’
indra/llui/llmultisliderctrl.cpp:283:12: error: ‘caller’ was not declared in this scope
indra/llui/lltexteditor.cpp
- error: operands to ?: have different types ‘const LLPointer<LLTextSegment>’ and ‘long int’
- error: passing ‘const LLPointer<LLTextSegment>’ as ‘this’ argument of ‘LLPointer<Type>& LLPointer<Type>::operator=(const LLPointer<Type>&) [with Type = LLTextSegment]’ discards qualifiers
indra/newview/llfloaterpermissionsmgr.cpp - Silly Shyotl, boost bind, not std bind.
indra/newview/llfloaterproperties.* - error: ‘LLInstanceTracker<LLFloaterProperties, LLUUID>’ is an inaccessible base of ‘LLFloaterProperties’
indra/newview/llgivemoney.cpp - Again, boost::ref, not std::ref
indra/newview/llpreviewscript.cpp - no known conversion for argument 1 from ‘std::vector<const LLPointer<LLTextSegment> >’ to ‘std::vector<LLPointer<LLTextSegment> >&
2013-05-27 08:09:28 -04:00
Lirusaito
a10708e9be
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-05-27 04:07:38 -04:00
Lirusaito
8769b98b31
Add Bottom offset spinner to the Chat Console section of Text Chat prefs, thanks Ratany!
2013-05-27 03:08:09 -04:00
Siana Gearz
6fca791632
Fortify on release doesn't work and throws warnings on F18
2013-05-27 08:48:45 +02:00
Siana Gearz
7c675af943
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
2013-05-27 08:40:26 +02:00
Siana Gearz
074e6c135b
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-05-27 08:37:39 +02:00
Siana Gearz
e9a323af9f
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer
2013-05-27 08:36:56 +02:00
Siana Gearz
8b085bd03d
Matching movement rebuild code with V3 again
2013-05-27 08:35:07 +02:00
Siana Gearz
772f5e0e5d
Somebody just won the prize for the least working contributed code.
...
Just made it compile and look like it does something sane, don't have time to test it at the moment.
2013-05-27 08:12:39 +02:00
Siana Gearz
62be5ae913
Merge branch 'v2URI' of https://github.com/Swiftkill/SingularityViewer
2013-05-27 06:48:51 +02:00
Siana Gearz
3cd16c84ef
Dirty patch Intel HD4000 shader-confusion
2013-05-27 06:47:00 +02:00
Aleric Inglewood
b6f6dfbe99
Fix french assert.
...
Fixes a possible ASSERT(!(need_new_run && !mYieldEngine &&
sub_state_r->run_state == run_state)).
When over all multiplex_impl functions and this is the only case that I
found where it could return without changing the state and without
calling either idle() or yield().
2013-05-27 02:15:28 +02:00
Melanie
4abe27f7f5
Move the octopus so the swirlies will not happen when CCS is attached in SL
2013-05-26 17:10:23 +02:00
Siana Gearz
c61415d785
Canonicalize detach crash fix to RLVa
2013-05-26 15:56:22 +02:00
Siana Gearz
89e7decc12
Bring chat focus behaviour closer to Phoenix by default, and an option
2013-05-26 14:34:19 +02:00
Siana Gearz
d4251e3f69
This should fix bridge detach and crash, thx Ansariel
2013-05-26 05:45:00 +02:00
Siana Gearz
bc145c95fb
Silence VC10 warnings
2013-05-26 05:43:28 +02:00
Lirusaito
9b4748ae71
Fix deleting all scripts in selection
...
Two real changes: 1. Don't tell the user we're counting scripts when they just want them gone; 2. When deleting a script, counter-iterate to avoid a crash
Adds a bit more debug spew commented out, helped me out with this.
Thanks to Sentinel for catching this early!
2013-05-25 20:51:15 -04:00
Lirusaito
9d3cc2a03b
Fix the issue with chat bubbles having the chatter's name at the start of normal messages, also connect the italicize actions option to chat bubbles.
...
Moves the "We have a real utterance now" block back above the concatenation of names and verbs and the message.
Maybe italicize should be tied to a separate setting for bubble chat, but for now let's see if it is fine in its current state.
2013-05-25 16:19:59 -04:00
Aleric Inglewood
a8880983c4
Fix WARNING: addData: Type mismatch in LLMsgVarData::addData for Set
2013-05-25 22:07:50 +02:00
Lirusaito
67c6864f5e
Update to french translation, thanks Nomade.
2013-05-25 15:30:55 -04:00
aragornarda
f7e45332bd
small typo fix
2013-05-25 18:26:42 +03:00
Melanie
326008c553
Correct curreny display in "serverside is now viewerside" currency dialogs on OpenSim
2013-05-25 05:36:11 +02:00
Aleric Inglewood
b1be8802ca
Fix URL to correct section for store creation.
2013-05-25 03:20:14 +02:00
Aleric Inglewood
3af2c13cd3
Compile fix for libcwd.
2013-05-25 03:19:33 +02:00
Lirusaito
1abd7f18f5
Tweak the increment and the minimum value of the draw distance slider on the graphics prefs panel to display the same values as seen on the quick prefs.
...
Thanks to Xanthe Yordstorm for pointing out this inconsistency!
2013-05-24 20:53:15 -04:00
Lirusaito
6cfaeeb37b
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting
2013-05-24 17:30:54 -04:00
Latif Khalifa
bd2b25b12b
Merge remote-tracking branch 'lirusaito/master'
2013-05-24 19:56:34 +02:00
Latif Khalifa
f67ac97fcf
Revert the last change of VSTool.exe
2013-05-24 06:00:22 +02:00
Lirusaito
19996468c1
Correct a flipped bool
2013-05-23 17:37:19 -04:00
Lirusaito
0e8fed0dc5
Minor update to group roles panel from upstream
...
Don't add names that haven't been looked up yet to the group roles list, wait for them to be looked up, then check them against the filter.. this avoids unrelated names getting turned up in the list under a filter.
Also diverged a bit from upstream to filter using the displayed names, since people who are only having Display Name shown will get inconsistent names turned up by the filter, otherwise. (Searching "Inusaito Kanya" would turn up "Aur'a Færs" in the results, which obviously isn't what they're looking for... maybe this should be done with complete name, but logically you should see what you searched in your results)
2013-05-23 17:36:41 -04:00
Lirusaito
99ea3facce
Just some touch-ups to the radar, they compile and won't affect anything, but they'll help in the future.
2013-05-23 14:28:11 -04:00
Lirusaito
2b6f49a398
Warning missing a space between "avatar" and appended uuid was annoying me.
2013-05-22 21:52:19 -04:00
Lirusaito
ceea30977e
Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer
2013-05-22 12:50:45 -04:00
Lirusaito
0509fdfdf2
Apparently the navmesh can be dirty when dynamic pathfinding is disabled... fixed the icons to anticipate this silliness.
2013-05-22 11:41:06 -04:00
Lirusaito
a0d6f11c4e
Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer
2013-05-22 11:05:05 -04:00
Lirusaito
e3bd635510
Redid ScriptCounter entirely, should fix 182, if not just prevent the permanent failure condition.
...
Script Counter now shows the names of avatars in the user's desired format.
Adds "Count Scripts in Selection" to the Tools menu. (Can count for multiple objects, quite useful for land owners, no?)
Makes the Script Counting strings translatable. (ScriptCounting, ScriptCountAvatar, ScriptCountObject, and ScriptDeleteObject)
ScriptCounter is no longer a giant pile of static, it goes away when it has run its course and multiple instances can exist simultaneously.
Removes the silly unneeded parts of ScriptCounter, and thus removes it from llstartup.cpp
Adds some nice documentation in comments, and moves some log output to proper places (although I commented it out, it proved quite spammy for high primcount objects, initial loop runs super fast)
Trying to view this diff with no space changes is the best course of action, but even that will be tough...
Adds a header guard to scriptcounter.h
Hooks up menu function LLObjectVisibleScriptCount to Object.VisibleScriptCount, apparently this was never hooked up.... strange
2013-05-22 11:01:43 -04:00
Latif Khalifa
f03a76c3c4
Merge remote-tracking branch 'lirusaito/master'
2013-05-22 02:11:22 +02:00
Lirusaito
ea52583510
LLFloaterNewIM was no longer used, I plucked it out.
2013-05-21 19:09:41 -04:00
Aleric Inglewood
ed8fa9229f
Merge remote-tracking branch 'singu/master'
2013-05-21 23:58:53 +02:00
Aleric Inglewood
cf4c4a72c2
Added AICapabilityType and related.
...
This splits the AIPerService queue up into four queues: one for each
"capability type". On Second Life that doesn't make a difference in
itself for textures because the texture service only serves one
capability type: textures. Other services however can serve two types,
while on Avination - that currently only has one services for everything
- this really makes a difference because that single service now has
four queues.
More importantly however is that the administration of how many requests
are in the "pipeline" (from approving that a new HTTP request may be
added for given service, till curl finished it) is now per capability
type (or service/capabitity type pair actually). This means downloads of
a certain capability type (textures, inventory, mesh, other) will no
longer stall because unapproved requests cluttered the queue for a given
service.
Moreover, before when a request did finished, it would only look for a
new request in the queue of the service that just finished. This simple
algorithm worked when there were no 'PerSerice' objects, and only one
'Curl' queue: because if anything was queued that that was because there
were running requests, and when one of those running requests finished
it made sense to see if one of those queued requests could be added now.
However, after adding multiple queues, one for each service, it could
happen that service A had queued requests while only requests from
service B were actually running: only requests of B would ever finish
and the requests of A would be queued forever.
With this patch the algorithm is to look alternating first in the
texture request queue and then in the inventory request queue - or vice
versa, and if there are none of those, look for a request of a different
type. If also that cannot be found, look for a request in another
service. This is still not optimal and subject to change.
2013-05-21 23:34:23 +02:00
Lirusaito
619b6723ea
French Translation update, Merci Selvone et Nomade!
2013-05-21 07:31:27 -04:00
Lirusaito
58eee7e88b
Translation cleanups and xml fixes
...
Removes some areas where grid-specific currency was not being used.
Removes old, obsolete files.
2013-05-21 05:41:51 -04:00
Shyotl
a8fb7e812a
Fix rightclicking fully transparent prims when show-transparent is enabled.
2013-05-20 20:51:27 +02:00
Inusaito Sayori
ee785f0f17
Allow turning flying on and off while seated, if using Continue Fly On Unsit
...
Note: Redundant code, but these functions will likely be merged eventually(FUI-esque project), so it doesn't matter for now.
2013-05-20 12:14:58 -04:00
Inusaito Sayori
370b41e7b0
Fix Issue 448: Minimum window size too large
2013-05-20 10:09:27 -04:00
Inusaito Sayori
5c9286f460
Modernize and improve upon LLFloaterReporter to fix Issue 822: Report Abuse does not populate Region Name or screenshot correctly
...
Cleans up related bits in xmls/translations
2013-05-20 09:09:03 -04:00
Inusaito Sayori
6048c2405b
Correct the (hopefully) last chat color issues~
2013-05-20 08:39:51 -04:00
Shyotl
20af325e2c
Increased horizontal axis ranges for fps and ktri statistics in statistics view.
2013-05-20 00:38:58 -05:00
Shyotl
c5fc945f33
Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.
...
Cleaned up LLKeyWords
Cleaned up LLStatBar
Added per-account setting access to ui library
Added LLUICachedControl
Updated LLUIString
2013-05-20 00:36:34 -05:00
Inusaito Sayori
0c3f8f77e1
Fix the issue in which during conference chats the user's name is displayed as legacy, not linked, the wrong color, and their chat is not in their chosen color
...
Removes the "not sure why" block of code that sets the other_participant_id null if it's really from the user.
I have no idea why this ever was needed, it's a hack for certain, and only breaks things now.
2013-05-19 15:21:08 -04:00
Inusaito Sayori
c77c0b641b
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-05-19 12:26:07 -04:00
Inusaito Sayori
1ca2a567cd
Improve upon the nametag system
...
Use the user-desired name with Resident stripped out, when on SecondLife grid.
When using legacy names without group titles, don't show the last name on a new line.
When using chat bubbles or typing bubbles, use the desired tag color.
2013-05-18 19:24:42 -04:00
Inusaito Sayori
8f3fe5dfae
File mode fixes for some exe, plist, and glsl files.
2013-05-18 11:45:27 -04:00
Inusaito Sayori
949fa829c2
Improve enable_object_edit() so that the Edit pie menu entry doesn't take forever to enable
...
Bypasses pointless call to LLSelectMgr::getInstance()->selectGetAllValidAndObjectsFound()
Cleans up RLVa patch to read more clearly (this change is better viewed without spaces)
2013-05-18 10:57:19 -04:00
Latif Khalifa
f4261e35f4
Merge remote-tracking branch 'lirusaito/master'
2013-05-18 15:12:46 +02:00
Latif Khalifa
4f2534790c
Merge remote-tracking branch 'shyotl/master'
2013-05-18 15:12:26 +02:00
Shyotl
df404c42d0
Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer
2013-05-17 16:46:40 -05:00
Shyotl
b1d69d05c3
Further pluggged in LLView::Params. For now just used for a few exclusively hard-coded elements. XUI parsing not yet implemented. New element registry not yet implemented.
2013-05-17 14:45:23 -05:00
Inusaito Sayori
00bbbe70a7
Fix a bug pointed out by LaMont Zuzu in which a texture dragged and dropped to one's profile image would be sent back to the user
...
Removes the unnecessary drop target and give item text in these cases.
On someone else's profile, you may drag and drop a replacement texture
On your profile, you have no reason to drag and drop an item, in fact this can cause bad inventory issues (yes, I've tested it)
2013-05-17 10:06:08 -04:00
Aleric Inglewood
74102e4964
Force running AIMeshUpload in the main thread.
...
I don't think it did -- but theoretically it could run in any thread
the way it was.
2013-05-17 15:07:45 +02:00
Aleric Inglewood
8688f6e772
Detect infinite loop.
2013-05-17 15:07:45 +02:00
Aleric Inglewood
ca66f44c0e
Obscure bug fix. Not relevant in the current viewer code.
2013-05-17 15:07:32 +02:00
Inusaito Sayori
36e218cf19
One more git ignore needed, thanks Latif!
2013-05-17 04:03:42 -04:00
Inusaito Sayori
9742794d08
If possible, figure out the typing person's name according to the name system before showing that they are typing.
...
(IE: "Aur'a Færs (inusaito.kanya)is typing..." instead of "Inusaito Kanya is typing...")
This adds consistency between chat and messages, and should Resident strip in most cases.
2013-05-17 03:12:10 -04:00
Inusaito Sayori
0f2a4707a3
Add top level build directory to gitignore, and mode change on files that certainly shouldn't be executable.
2013-05-17 03:02:57 -04:00
Shyotl
182b15aee5
Forgot to put changes to pipeline.cpp into the previous vbo commit. Oh well.
2013-05-16 01:59:15 -05:00
Shyotl
2b30a5a4e7
Catch case in llaudioengine where audio buffers are released with channels still consuming them(A proper fix should be done to avoid this scenario in the future).
...
Added stricter checking for fmodex errors.
Demote a harmless message from llinfos to lldebugs when audio buffers are all consumed.
Initialize LLAudioBuffer member variables.
-LLAudioBuffer::mInUse is inited to TRUE to avoid buffers that just got created from getting deleted during the same frame by new audio sources further down the chain.
2013-05-16 01:58:35 -05:00
Shyotl
2bdd695d5f
Updated LLVertexBuffer to match v3 a bit better. Let's see how it fares.
2013-05-16 01:42:45 -05:00
Shyotl
be29088103
Bad merge introduced superfluous drawable clearstate call.
2013-05-15 22:47:56 -05:00
Siana Gearz
42e42dedd7
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-05-14 10:04:31 +02:00
Siana Gearz
3c7f3b2af9
Speculative linux buildbot build fix
2013-05-14 10:00:44 +02:00
Lirusaito
048fe6e862
French translation update/cleanup
2013-05-13 06:05:39 -04:00
Siana Gearz
63f152e78d
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer
2013-05-13 02:43:49 +02:00
Lirusaito
a861a90013
Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer
2013-05-12 20:13:19 -04:00
Lirusaito
5730abb6c8
French Translation Update
2013-05-12 20:09:34 -04:00
Lirusaito
42a14952e7
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2013-05-12 15:15:06 -04:00
Lirusaito
36e2ee5dfb
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting
2013-05-12 14:31:29 -04:00
Swiftkill
afa82fb0a5
updated secondlife:///app/group and secondlife:///app/agent namespaces to 2.0
2013-05-12 21:56:02 +04:00
Drake Arconis
eef53e3eac
Merge branch 'master' of git://github.com/singularity-viewer/SingularityViewer
2013-05-12 10:08:49 -07:00
Drake Arconis
075bbe6831
NyanNyanNyan
2013-05-12 10:08:33 -07:00
Aleric Inglewood
67e88561dc
Queue/throttle fix.
...
If AIPerService::add_queued_to fails because a new request is throttled,
then do not add the request to the end of the queue, nor remove it from
the queue: do nothing: it makes no sense to move the request to the back
because they all belong to the same service and all of them will be
either throttled or not.
Note: Still need to fix that in this case we should look in queues of
other services.
2013-05-12 18:10:49 +02:00
Aleric Inglewood
f8aac1f3dd
Lets CurlEasyHandle::approved() stay consisten throughout its lifetime.
2013-05-12 17:56:29 +02:00
Aleric Inglewood
80c8eaab2a
Ask approvement for each HTTP request.
...
The old code could do up till four requests with only one approvement.
Now we just start to assemble the four types of requests until either we
can get approvement for one, or one of them gets too large. This way we
still request everything in the same order, and at LEAST as many per
call as before, assuming we get the approvement of course.
The result should actually be faster because now we will request up to 5
folders or items per capability, and not spread those 5 out over 2 to 4
capability requests.
2013-05-12 16:51:48 +02:00
Lirusaito
5fc712104a
Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting
...
Conflicts:
indra/newview/linux_tools/wrapper.sh
2013-05-12 03:33:34 -04:00
Lirusaito
417dcb4e49
Frosting touchups
...
Cleaned up flaws in LLUUID
- Removed deprecated LLUUID::toString(char*) and LLUUID::toCompressedString(char*)
Cleaned up some comments
2013-05-11 23:14:16 -04:00
Lirusaito
9b5360a40b
Chat Frosting
...
Basic Summary:
Issue 743: [Chat UI] Option to italicize actions (/me) in chat
- Adds debug LiruItalicizeActions, and a checkbox to Adv. Chat->Chat UI preferences
Issue 737: [Frosting] Annoyance Removal (Red beacon after teleport using LM's)
- Adds debug ClearBeaconAfterTeleport, checkbox under System->General
Issue 639: [Frosting] The agent isn't identified properly in chat
- Oh what a silly issue this was, it's as though whoever wrote this didn't care.
Fixes issue where names in logs do not match names in chat due to display name system
Fixes the issue in which Unnamed objects got named by a hardcoded string under certain circumstances.
Issue 813: [Frosting] When only accepting from friends, do not display incoming chat notification for nonfriends
- Also broke the setting out, separating it from the voice calls friend only setting
- Adds InstantMessagesFriendsOnly debug setting and checkbox in Adv. Chat->Chat/IM
Issue 764: Copy SLURL from Map returns correct region but wrong coordinates.
Satisfied the longstanding issue of inflexible autoresponse options.
- Autoresponse now has its own tab in Adv. Chat preferences: Busy, Muted, nonfriends, and anyone (or just friends) can have separate responses, along with items of your choosing.
- Prevent doubling up with the first repeated autoresponse due to typing message and normal message.
Translator Summary:
Adv. Chat->Chat UI->"Italicize action messages (/me)"
System->General->"Clear red destination beacon after teleporting"
Drop Targets for floater_ao.xml, panel_avatar.xml, panel_group_notices.xml, and panel_preferences_ascent_system.xml
Adv. Chat->Chat/IM->"Only accept IMs from Friends"
Please clean up the Busy Mode Response elements from panel_preferences_im.xml
strings.xml now has "IM_autoresponse_minutes"
Adv. Chat (panel_preferences_ascent_chat.xml) now has a new panel "Autoresponse", please clean up the old Autoresponse elements from Chat/IM tab and translate this panel.
Developer Summary:
Adds EChatStyle to LLChat, used for identifying what style a piece of chat is.
Update settings_per_account.xml
- Reorganized the ascent specific section.
- Removes a few old and unused settings
Better organize settings_per_account_ascent.xml
- TODO: Actually get this include system working and remove the Ascent specific section in settings_per_account.xml
Modernize LLDropTarget and make it more flexible and stand alone
- The Text of drop targets is now a child of the target itself, meaning the necessity of having a static instance to the parent is eliminated
- Drop targets are now one element in UI XML.
- Drop targets now have fill_parent option which allows the target to spread over the parent, while the text, tool_tip, and border stays in place
- If Drop Targets have a control_name, it is from the per account settings group, since Items must be in the inventory of the account in question.
- All drop targets now use the common LLDropTarget class instead of their own.
- LLGroupDropTarget is now derived from LLDropTarget and has its own tag group_drop_target.
Cleaned up the focus functions we use to focus the input bar, setInputFocus exists for their purpose.
Updated our llim* code to line up better with upstream and conform to styling.
Polished LLTracker and LLFloaterWorldMap a bit
Cleaned/Updated up LLStyleMap a bit.
Optimized autoresponse code:
- wildcards are now replaced via boost::algorithm::replace_all
- Autoresponse and related chat enhancements are now performed inside their case, instead of by the large if block above.
2013-05-11 22:36:46 -04:00
Aleric Inglewood
929badb110
Let statemachine honor approvements.
...
The inventory bulk fetch is not thread-safe, so the it doesn't start
right away, causing the approvement not to be honored upon return from
post_approved (formerly post_nb).
This patch renames wantsMoreHTTPReqestsFor to approveHTTPRequestFor,
and has it return NULL or a AIPerService::Approvement object.
The latter is now passed to the CurlEasyHandle object instead of just a
boolean mQueueIfTooMuchBandwidthUsage, and then the Approvement is
honored by the state machine right after the request is actually added
to the command queue.
This should avoid a flood of inventory requests in the case
approveHTTPRequestFor is called multiple times before the main thread
adds the requests to the command queue. I don't think that actually ever
happens, but I added debug code (to find some problem) that is so damn
strictly checking everything that I need to be this precise in order to
do that testing.
2013-05-12 04:19:44 +02:00
Siana Gearz
54983bcc89
Fixing some syntactic and build system stupidity
2013-05-11 23:40:26 +02:00
Siana Gearz
b344873954
Forgotten file and fix
2013-05-11 21:46:41 +02:00
Siana Gearz
c43dd499d0
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-05-11 20:45:00 +02:00
Siana Gearz
6c2d5eea30
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2013-05-11 20:39:06 +02:00
Siana Gearz
9183cffb44
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer
2013-05-11 20:36:41 +02:00
Siana Gearz
e86f3a5cbd
Starting war on std::map. Peeked at what NickyD and Zwag were doing.
2013-05-11 17:52:13 +02:00
Aleric Inglewood
3d63f9cd24
WIP on inventory background fetch
2013-05-11 16:04:34 +02:00
Aleric Inglewood
de1d44080d
Fix terrain textures not updating after terraform or elevation range change.
2013-05-08 20:16:40 +02:00
Lirusaito
c13ed02ec8
Compile fixes (for GCC 4.8)
2013-05-08 00:55:50 -04:00
Lirusaito
f48eca366a
Issue 773: Add option to update currently worn outfit
2013-05-08 00:47:55 -04:00
Lirusaito
29c2bc2bed
It may be a little misleading, but Script Info in the attachment piemenu is useful
...
I hadn't committed it at first since it gives more than just information about the selected attachment,
and there was no way to scroll to the selected attachment in the list and highlight it,
but sometimes the avatar's body is covered in attachments, so the entry in the avatar body menu alone isn't enough.
2013-05-07 19:30:02 -04:00
Aleric Inglewood
d2af4a3c23
WIP: comment out llasserts.
...
This way my master isn't totally broken, at least ;).
2013-05-07 23:02:56 +02:00
Aleric Inglewood
5b1984ed0c
WIP: Added AIPerService::Approvement
2013-05-07 19:36:10 +02:00
Aleric Inglewood
e3fec7c715
AIPerService improvements.
...
* Removed the 'RequestQueue' from other PerServiceRequestQueue occurances
in the code.
* Made wantsMoreHTTPRequestsFor and checkBandwidthUsage threadsafe (by
grouping the static variables of AIPerService into thread ThreadSafe
groups.
2013-05-07 16:10:09 +02:00
Aleric Inglewood
410f9d92a5
Minor improvemnt of coding style.
2013-05-07 02:01:31 +02:00
Drake Arconis
47e83bf677
Merge remote-tracking branch 'LiruFox/master'
2013-05-06 11:44:21 -07:00
Siana Gearz
30332cff3f
Sanitize cmake, cleanup develop.py
2013-05-06 06:07:23 +02:00
Drake Arconis
e0ef803ed5
Fix issue a different way and supress new gcc 4.8 warning
2013-05-05 19:24:13 -07:00
Aleric Inglewood
84e7f15dc5
Fix initialization list order (compiler warnings)
2013-05-06 03:26:22 +02:00
Drake Arconis
36416743d4
fix a buggy
2013-05-05 18:23:26 -07:00
Drake Arconis
73b10e6b29
Made compiler detection more reliable and cleanup clang warnings
2013-05-05 17:56:16 -07:00
Aleric Inglewood
1d629438c0
Add HTTP bandwidth throttling for every other responder.
...
Most notably getMesh (the only one possibly using any significant
bandwidth), but in general every type of requests that just have to
happen anyway and in the order they are requested: they are just passed
to the curl thread, but now the curl thread will queue them and hold
back if the (general) service they use is loaded too heavily.
2013-05-06 02:54:10 +02:00
Aleric Inglewood
75a45f501e
Moved a part of AIPerService::wantsMoreHTTPRequestsFor to a new function.
...
The new function is AIPerService::checkBandwidthUsage.
No functional changes were made.
2013-05-06 02:54:10 +02:00
Aleric Inglewood
fd3e8e4a23
Preparation for AIPerService::checkBandwidthUsage.
...
Don't pass arguments to wantsMoreHTTPRequestsFor, but use globals in
llmessage: AIPerService::sHTTPThrottleBandwidth125 and
AIPerService::sNoHTTPBandwidthThrottling instead.
This is needed later on.
2013-05-06 02:54:03 +02:00
Aleric Inglewood
32a5494c79
Limit sMaxPipelinedRequests changes to once per 40ms, plus code clean up.
...
Mostly renaming stuff and moving static variables to class AIPerSerive.
2013-05-04 20:02:21 +02:00
Shyotl
6fb0c158de
Fix rightclicking fully transparent prims when show-transparent is enabled.
2013-05-03 21:42:14 -05:00
Shyotl
e8ce35ebf8
Merge branch 'master' into UICleanup
...
Conflicts:
indra/llcommon/llstl.h
indra/newview/jcfloaterareasearch.cpp
indra/newview/jcfloaterareasearch.h
indra/newview/llfloateranimpreview.cpp
indra/newview/llfloateranimpreview.h
indra/newview/llfloaterperms.cpp
indra/newview/llfloaterproperties.cpp
indra/newview/llpanelpermissions.cpp
indra/newview/llviewermenu.cpp
2013-05-03 21:41:51 -05:00
Shyotl
532fc68657
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2013-05-03 15:36:05 -05:00
Shyotl
525f3c6a1d
Added new transformfeedback fasttimers, and disabled rasterizing when performing transform feedback.
2013-05-03 14:35:10 -05:00
Shyotl
808341e184
Testing: Be a bit more OCD about avoiding starting new streams before the previous one has been successfully been released.
2013-05-03 14:32:18 -05:00
Shyotl
701fc87c05
Minor cleanup and additional nullchecks.
2013-05-03 14:29:55 -05:00
Shyotl
31eb3e8d24
Cleaned up LLManipScale::nearestAxis to dodge a compiler crash that was found when playing with particular compiler options.
2013-05-03 14:28:20 -05:00
Latif Khalifa
a2df4b6693
Merge remote-tracking branch 'aleric/master'
2013-05-03 19:40:56 +02:00
Latif Khalifa
25dd719e39
Revert "Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working."
...
On-the-fly switching of UseHTTPInventory provided in patch by Aleric.
This reverts commit bdb74add3c .
2013-05-03 19:39:54 +02:00
Aleric Inglewood
4cc42cd5bd
Fix for file-5.14
2013-05-03 19:05:31 +02:00
Aleric Inglewood
4983fd6ab6
Allow switching between HTTP and UDP inventory without relogging.
...
This also makes the viewer immune for grids that send the FetchInventory2 et al
capabilities regardsless of whether we requested them (in fact, we always
request them now: we need them when someone switches in the middle of a session).
Note that (I tested that) textures could already be switched between
HTTP and UDP without relogging.
2013-05-03 18:24:33 +02:00
Aleric Inglewood
673e96e829
Linux script fix at exit viewer.
2013-05-03 00:06:32 +02:00
Shyotl
b0778bf27e
Template fun to compress our legacy menu<->floater glue.
2013-04-30 20:30:51 -05:00
Shyotl
b474b3c680
Avoid bogging down main thread with excessive LLInstanceTrackerBase::getInstances calls.
2013-04-30 20:27:03 -05:00
Melanie
bdb74add3c
Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working.
2013-05-01 02:29:34 +02:00
Melanie
fc183be845
Add RLV toggle to prefs
2013-05-01 02:29:17 +02:00
Melanie
e00293baba
Add the Limit Select Distance control to the input&camera panel
2013-05-01 01:56:36 +02:00
Melanie
ec266b895e
XMLize the "Singularity" menu and add Rebake and Region Debug Console to it.
2013-05-01 00:23:10 +02:00
Aleric Inglewood
13e246611d
Make refresh_desktop_app_entry.sh executable.
2013-04-30 22:48:32 +02:00
Aleric Inglewood
873b61c39d
Fix comment.
2013-04-30 22:16:29 +02:00
Aleric Inglewood
60a47b8915
Merge remote-tracking branch 'singu/master'
2013-04-30 20:43:40 +02:00
Aleric Inglewood
0c7e62ab59
Add throttling to HTTP inventory (bulk) fetching.
...
Call AIPerService::wantsMoreHTTPRequestsFor in
LLInventoryModelBackgroundFetch::bulkFetch to determine if curl is ready
for the next batch or not, instead of using inaccurate heuristic code
that is just guessing a bit.
2013-04-30 20:36:00 +02:00
Aleric Inglewood
a1a019d319
Don't call LLInventoryModelBackgroundFetch::backgroundFetchCB unnecessarily
...
Remove LLInventoryModelBackgroundFetch::backgroundFetchCB from
gIdleCallbacks when we don't need it anymore.
2013-04-30 20:34:01 +02:00
Aleric Inglewood
3cedc7bb81
Stats floater fix up.
...
Add '(UDP)' after Objects, to show that this is UDP bandwidth.
Do not add the received HTTP texture bytes to gTextureList.sTextureBits,
making it (and the 'UDP Textures' graph) indeed pure UDP.
2013-04-30 20:30:46 +02:00
Aleric Inglewood
74023d5303
Compile fix.
...
Move the destructor (and copy constructor while I was at it) to the .cpp
file in order to avoid instantiating the destructor of
boost::intrusive_ptr<ThreadSafeBufferedCurlEasyRequest> from a header,
which would require the class ThreadSafeBufferedCurlEasyRequest
to be defined in that header, which is unnecessary. In other words,
this avoid the need to include "aicurl.h" in headers using
AIPerService[Ptr].
Also fixed indentation of a comment.
2013-04-30 20:23:42 +02:00
Aleric Inglewood
2a9c48d8d3
Add debug function 'is_single_threaded'
...
Usage:
AIThreadID foo(AIThreadID::none);
...
llassert(is_single_threaded(foo));
...
llassert(is_single_threaded(foo));
...
etc
The first call to is_single_threaded(foo) remembers the thread,
and after that it is enforced that any call from anywhere that uses foo
is done by the same thread.
If AIThreadID::none is omitted then the thread is enforced to the thread
that creates the AIThreadID.
2013-04-30 20:22:38 +02:00
Aleric Inglewood
19e16240d4
Less overshoot in HTTP bandwidth graph for higher values.
2013-04-30 19:13:06 +02:00
Latif Khalifa
e1df1b98f7
Merge remote-tracking branch 'aleric/master'
2013-04-28 23:35:30 +02:00
Melanie
c1e31c403e
Make sure we only do a show in inventory if a sinle item is given. Enything else makes no sense or bombs
2013-04-28 23:32:17 +02:00
Melanie
2cfafadbcd
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
...
Conflicts:
indra/newview/hippogridmanager.cpp
indra/newview/hippogridmanager.h
2013-04-28 20:32:58 +02:00
Melanie
aa996a3a1b
Finally allow a very small communicate window to be saved and restored properly at the size the user set it.
2013-04-28 19:42:18 +02:00
Damian Zhaoying
3cb6e5fa9f
Little fix in some spanish translations
2013-04-28 13:35:52 -03:00
Aleric Inglewood
1d2b3d3dc9
Derived classes may access this.
2013-04-28 03:31:16 +02:00
Melanie
77fdb895e6
Add CURRECY_TEXT definition and handling for internationalization
2013-04-27 02:39:39 +02:00
Damian Zhaoying
ecf87fd720
add new all spanish translations files
2013-04-26 20:51:14 -03:00
Damian Zhaoying
d2acf3c6a1
update and fix all spanish translations files
2013-04-26 20:03:28 -03:00
Aleric Inglewood
ebfb76c284
Renamed AIPerServiceRequestQueue[Ptr] to AIPerService[Ptr]
...
This because AIPerService now contains a lot more than just the request
queue.
2013-04-26 19:20:10 +02:00
Aleric Inglewood
6c1335af50
Moved connect limits per service to AIPerServiceRequestQueue.
...
Added AIPerServiceRequestQueue::mConcurrectConnections and
AIPerServiceRequestQueue::mMaxPipelinedRequests.
2013-04-26 19:13:18 +02:00
Aleric Inglewood
304e2b4958
Pass LLControlGroup* to AICurlInterface::startCurlThread instead of each Debug Setting separately.
2013-04-26 16:47:22 +02:00
Aleric Inglewood
fb2f0dd164
Add support for uploading .anim files.
...
Mostly works, but
indra/newview/skins/default/xui/en-us/floater_animation_anim_preview.xml
needs work (the 'Name:' should be at the top, not the bottom).
Also, it asks if you want to upload this as temporary. It shouldn't do
that.
2013-04-25 19:05:52 +02:00
Lirusaito
570c857128
XML corrections
...
French corrections
Correct Aleric's mistype of tool_tip
2013-04-25 04:38:53 -04:00
Latif Khalifa
b1ffc5b349
Merge remote-tracking branch 'lirusaito/master'
2013-04-25 07:27:13 +02:00
Latif Khalifa
dc4d458e87
Merge remote-tracking branch 'aleric/master'
2013-04-25 07:26:45 +02:00
Aleric Inglewood
e422a89de8
Bring back "Refresh Grid Info" button in grid manager.
...
If you clicked on 'Add' and then filled in the fields that say
'<required>'.. and then click on OK... Then all the URL's stay blank and
there is no way to fix that anymore (short of deleting the entry first
and NOT filling in the required name?!).
I added the button back to get the URL, at any time. Much more clear.
While at it, I added some tool tips and renamed 'Add' to 'Create'
because it confused the hell out of me to have a grid selected and then
needing to press 'Add' below that.. as if you add something to the
selected grid (Better would be to have the Add button above the
selector, or even be part of the selector drop down).
2013-04-25 03:32:48 +02:00
Shyotl
ef9fbe2193
Attempt to speed up agent idle update by optimizing wearable/visualparam related lookups/iterations a bit more.
...
Generalized several templates in llstl.h in order to support more containers.
Removed several instances of is_in_map/getWearableCount being followed immediately by another lookup with the same key. find is more efficient, as we get an iterator to use instead of a simple boolean.
2013-04-24 17:52:17 -05:00
Aleric Inglewood
45e6b7975f
First version of HTTP bandwidth throttling.
...
Adds throttling based on on average bandwidth usage per HTTP service.
Since only HTTP textures are using this, they are still starved by other
services like inventory and mesh dowloads. Also, it will be needed to
move the maximum number of connections per service the to the PerService
class, and dynamically tune them: reducing the number of connections is
the first thing to do when using too much bandwidth.
I also added a graph for HTTP texture bandwidth to the stats floater.
For some reason the average bandwidth (over 1 second) look almost like
scattered noise... weird for something that is averaged...
2013-04-24 22:04:21 +02:00
Lirusaito
b0c331266d
Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer
2013-04-24 14:22:35 -04:00
Lirusaito
0aeafdcca7
French Translation Update!
2013-04-24 14:17:31 -04:00
Lirusaito
bca8f830f2
Group Feature Request: Optionally display indicator over typing avatar's heads.
...
Adds Debug Setting UseTypingBubbles
Adds "Use overhead typing indicator bubbles" to Adv. Chat-> Chat/IM
Thanks to Firestorm for this simple addition
2013-04-24 14:15:00 -04:00
Lirusaito
3a4714edb1
File Menu Frosting~
...
Adds Minimize All, and Change Local Textures options
People keep adding how to do Local Textures, here's an easy way right where it'd be expected!
2013-04-24 14:09:04 -04:00
Lirusaito
464b1890f5
Update to linux_tools
...
Modernizes viewer_manifest.py
adds install.sh and refresh_desktop_app_entry.sh for those who want to "install" Singularity to their applications.
Updates client-readme-voice.txt to explain about Multi-Voice
2013-04-24 11:37:26 -04:00
Latif Khalifa
ec8212f472
Merge remote-tracking branch 'aleric/master'
2013-04-24 04:56:19 +02:00
Latif Khalifa
891417d0a5
Merge remote-tracking branch 'lirusaito/master'
2013-04-24 04:56:05 +02:00
Lirusaito
b60ee67b0c
Make GCC 4.8 a little happier by removing a copy pasted pointless line
2013-04-23 22:14:56 -04:00
Melanie
9cd9fcdfbe
Allow the export check box to show for rezzed objects in opensim - fixes a copypasta error
2013-04-24 02:47:07 +02:00
Aleric Inglewood
dc5e94812c
Inline accessors of HippoGridInfo.
2013-04-23 21:50:51 +02:00
Aleric Inglewood
bbee0bfdd5
Add -Wno-sign-compare back.
2013-04-23 21:37:22 +02:00
Aleric Inglewood
27549584aa
Merge remote-tracking branch 'singu/master'
2013-04-23 19:41:11 +02:00
Aleric Inglewood
96d8380099
Remove -Wno-sign-compare and fix DISABLE_FATAL_WARNINGS
...
Turn on sign-compare warnings and allow fatal warnings when
using -DDISABLE_FATAL_WARNINGS:BOOL=OFF during configuration.
The default is no -Werror.
2013-04-23 19:37:53 +02:00
Lirusaito
c7a9bd0f4f
Translation updates
2013-04-23 09:23:23 -04:00
Latif Khalifa
1f58d1250f
Merge remote-tracking branch 'lirusaito/master'
2013-04-23 12:57:33 +02:00
Latif Khalifa
f1ce3c89c3
Silence warnings
2013-04-23 12:57:02 +02:00
Latif Khalifa
a5bb6114b7
Merge remote-tracking branch 'siana/master'
2013-04-23 12:19:09 +02:00
Latif Khalifa
e0077b6941
Merge remote-tracking branch 'lirusaito/master'
...
Conflicts:
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
indra/newview/skins/default/xui/fr/panel_preferences_general.xml
2013-04-23 12:17:08 +02:00
Latif Khalifa
5396d17f2a
Merge remote-tracking branch 'aleric/master'
...
Conflicts:
indra/newview/lltexturefetch.cpp
indra/newview/llviewerwindow.cpp
2013-04-23 12:13:54 +02:00
Siana Gearz
d6d5d5ae1b
Bring back memory stat! Someone is a clobbermonster.
2013-04-23 11:46:44 +02:00
Lirusaito
24f08f7b0c
Linux64 should be mentioned in the usage of repackage.sh
2013-04-23 04:47:48 -04:00
Melanie
ca95c68af5
A fix to the octopus - use dialog channel for value replies
2013-04-23 04:58:28 +02:00
Melanie
274c51c536
Serverside outfits, part tow - final - call a CAP if outfit is changed successfully
2013-04-23 04:52:51 +02:00
Melanie
6addfdfd93
Small bug fix - this could never work
2013-04-23 03:23:14 +02:00
Melanie
72db1a02b7
Fix audio the proper way
2013-04-23 03:16:31 +02:00
Melanie
ba6b2ef865
Revert "Add the new audio init code (experimental)"
...
This reverts commit 1bc887f887 .
2013-04-23 03:15:59 +02:00
Melanie
df16ef39c5
Merge branch 'master' into Avination-4.0
2013-04-22 23:47:57 +02:00
Melanie
6296b5157b
Limit the number of texture fetchers to two for Avination as this gives a better user experience (less timeouts) with AVN server side throttling.
2013-04-22 23:47:41 +02:00
Melanie
a4032e5e70
Add the option to dynamically enable/disable controls to the octopus
2013-04-22 23:47:34 +02:00
Melanie
7923323031
Limit the number of texture fetchers to two for Avination as this gives a better user experience (less timeouts) with AVN server side throttling.
2013-04-22 23:46:28 +02:00
Melanie
1934e49f99
Add the option to dynamically enable/disable controls to the octopus
2013-04-22 23:45:56 +02:00
Melanie
1b15b5bf5d
Stage one of the new "change clothing" function. Introcuce an easy way to add generic packet handlers.
2013-04-22 15:02:23 +02:00
Melanie
1bc887f887
Add the new audio init code (experimental)
2013-04-21 05:55:47 +02:00
Melanie
cfe5236263
Remove info spam for empty event queue response - those can happen on opensim and we don't really need to know.
2013-04-21 05:55:15 +02:00
Lirusaito
bfb6e852a2
Added the serverside notifications that are localized now.
...
One snuck up on me, so I figured I'd add the bunch. Left out some at the end that looked like CHUI.
2013-04-20 22:09:50 -04:00
Melanie
fa5dba63dc
Merge branch 'master' into Avination-4.0
2013-04-21 03:35:54 +02:00
Melanie
c216e75d23
Fix a duplicate element name (copypasta error)
2013-04-21 03:31:38 +02:00
Melanie
3f6e0580af
Disable HTTP throttling for Avination as it's done serverside there
2013-04-21 03:31:29 +02:00
Melanie
fb781ab8f2
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-04-21 03:31:16 +02:00
Melanie
c38eb88915
Disable HTTP throttling for Avination as it's done serverside there
2013-04-21 03:30:27 +02:00
Melanie
43179bf853
Fix a duplicate element name (copypasta error)
2013-04-20 20:27:41 +02:00
Siana Gearz
e484904e3b
Version 1.8.0
2013-04-20 14:44:01 +02:00
Siana Gearz
24047c933a
No longer stall to death on unreadable streams
2013-04-20 13:27:32 +02:00
Latif Khalifa
41fba80cb5
More french translation updates
2013-04-20 08:51:15 +02:00
Melanie
11ba4d0d7d
Merge branch 'master' into Avination-4.0
2013-04-20 08:08:53 +02:00
Melanie
3075429bca
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-04-20 08:08:40 +02:00
Latif Khalifa
abc60bb235
Merge remote-tracking branch 'shyotl/master'
2013-04-20 08:06:04 +02:00
Shyotl
c9f93a82ce
Improved the logic in LLPipeline::updateDrawableGeom a bit.
2013-04-20 01:02:40 -05:00
Shyotl
39c4d9ad50
Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git
2013-04-20 01:01:26 -05:00
Shyotl
2121e78b45
Lessen occurrence of missing prims. Also added 'ctrl-shift-v' to rebuild vbos.
2013-04-20 01:00:24 -05:00
Melanie
37f3695e78
Merge branch 'master' into Avination-4.0
2013-04-20 06:40:51 +02:00
Melanie
1849b5ba1e
Add isAvination() function to hippo grid manager
2013-04-20 06:40:16 +02:00
Latif Khalifa
2580aad939
Re-apply saphira's Linux build patch that somehow got lost in merges
2013-04-20 05:26:47 +02:00
Aleric Inglewood
0b86c9eec1
Merge remote-tracking branch 'singu/master'
...
Conflicts:
indra/newview/llviewerwindow.cpp
c_str() dropped out (50f03d83c0 ).
Added it back.
2013-04-20 05:18:27 +02:00
Aleric Inglewood
368d675f24
Compile warning fix.
2013-04-20 05:07:44 +02:00
Aleric Inglewood
e12aaa3f5f
Compile warning fix.
2013-04-20 05:06:30 +02:00
Aleric Inglewood
55a676e85d
Compile warning fix.
2013-04-20 05:04:07 +02:00
Aleric Inglewood
9fb3fe21bc
Compile warning fix.
2013-04-20 05:03:17 +02:00
Aleric Inglewood
8d028e6948
Fix for AIStateMachineThread (LLThreadSafeRefCount: deleting non-zero reference)
...
This fixes
https://code.google.com/p/singularity-viewer/issues/detail?id=736
The problem was that we need to keep the 'user' derived THREAD_IMPL
alive in the thread, and therefore used an LLPointer<THREAD_IMPL>
(as base class of AIStateMachineThread<THREAD_IMPL>), and therefore
THREAD_IMPL, derived from AIThreadImpl had to be derived from
LLThreadSafeRefCount. However, AIStateMachineThread<THREAD_IMPL> also
needed to be a statemachine of itself and is derived from
AIStateMachineThreadBase derived from AIStateMachine which is ALSO
derived from LLThreadSafeRefCount - that in this case wasn't really
needed. An attempt to deactive it by calling ref() from the constructor
of AIStateMachineThreadBase failed on the fact that LLThreadSafeRefCount
insists that its ref count mRef is exactly zero when it is being
deleted.
The chosen solution is to remove the ref count from AIThreadImpl and use
the LLThreadSafeRefCount base class of AIStateMachineThreadBase. The
result is that not only THREAD_IMPL, but also the state machine object
is kept alive, but that doesn't seem like a problem.
Thus, instead of passing a AIThreadImpl* to
AIStateMachineThreadBase::Thread, we now pass a
AIStateMachineThreadBase* to it to keep the whole of the
AIStateMachineThread<THREAD_IMPL> object alive, which has a THREAD_IMPL
as member now. This member then can be accessed through a virtual
function impl(). Another result of this change is that the 'user' (the
class derived from AIThreadImpl, THREAD_IMPL) now has to deal with the
LLPointer, and use LLPointer<AIStateMachineThread<THREAD_IMPL> >
instead of just AIStateMachineThread<THREAD_IMPL> and also allocate
this object himself. The access from there then changes into a -> to
access the state machine (as opposed to a .) and ->thread_impl() to
access the THREAD_IMPL object (as opposed to a ->).
2013-04-20 04:54:25 +02:00
Latif Khalifa
70eb45e923
Revert "TEMPORARILY disable erroring out during mesh upload"
...
This reverts commit 3bdeb8e8a8 .
2013-04-20 04:53:44 +02:00
Latif Khalifa
7b42ad5e2a
Demote assert and allow UDP fallback in case COF fetching times out
2013-04-20 04:49:18 +02:00
Latif Khalifa
f6f505d487
Merge remote-tracking branch 'shyotl/master'
2013-04-20 04:29:59 +02:00
Aleric Inglewood
e0aa3489f8
Fix for AIStateMachineThread (LLThreadSafeRefCount: deleting non-zero reference)
...
This fixes
https://code.google.com/p/singularity-viewer/issues/detail?id=736
The problem was that we need to keep the 'user' derived THREAD_IMPL
alive in the thread, and therefore used an LLPointer<THREAD_IMPL>
(as base class of AIStateMachineThread<THREAD_IMPL>), and therefore
THREAD_IMPL, derived from AIThreadImpl had to be derived from
LLThreadSafeRefCount. However, AIStateMachineThread<THREAD_IMPL> also
needed to be a statemachine of itself and is derived from
AIStateMachineThreadBase derived from AIStateMachine which is ALSO
derived from LLThreadSafeRefCount - that in this case wasn't really
needed. An attempt to deactive it by calling ref() from the constructor
of AIStateMachineThreadBase failed on the fact that LLThreadSafeRefCount
insists that its ref count mRef is exactly zero when it is being
deleted.
The chosen solution is to remove the ref count from AIThreadImpl and use
the LLThreadSafeRefCount base class of AIStateMachineThreadBase. The
result is that not only THREAD_IMPL, but also the state machine object
is kept alive, but that doesn't seem like a problem.
Thus, instead of passing a AIThreadImpl* to
AIStateMachineThreadBase::Thread, we now pass a
AIStateMachineThreadBase* to it to keep the whole of the
AIStateMachineThread<THREAD_IMPL> object alive, which has a THREAD_IMPL
as member now. This member then can be accessed through a virtual
function impl(). Another result of this change is that the 'user' (the
class derived from AIThreadImpl, THREAD_IMPL) now has to deal with the
LLPointer, and use LLPointer<AIStateMachineThread<THREAD_IMPL> >
instead of just AIStateMachineThread<THREAD_IMPL> and also allocate
this object himself. The access from there then changes into a -> to
access the state machine (as opposed to a .) and ->thread_impl() to
access the THREAD_IMPL object (as opposed to a ->).
2013-04-20 04:28:23 +02:00
Shyotl
91db5a854f
Wrap std::filebuf to work with unicode filepaths on Windows. (Use UTF-16)
2013-04-19 21:27:47 -05:00
Lirusaito
b7c1b9f42b
Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm.
...
Conflicts:
indra/newview/llviewermessage.cpp
2013-04-20 03:45:15 +02:00
Melanie
2d717dcf17
Merge branch 'master' into Avination-4.0
2013-04-20 03:13:18 +02:00
Melanie
f83717255f
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-04-20 03:13:00 +02:00
Melanie
d593ebfa34
Add another menu insert point in the admin menu.
2013-04-20 03:12:49 +02:00
Melanie
35544cac74
Add another menu insert point in the admin menu.
2013-04-20 03:12:12 +02:00
Lirusaito
eac5a45562
Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm.
2013-04-19 20:10:05 -04:00
Latif Khalifa
3bdeb8e8a8
TEMPORARILY disable erroring out during mesh upload
2013-04-20 00:28:36 +02:00
Lirusaito
b8d2bd578c
French translation update
2013-04-19 23:59:18 +02:00
Lirusaito
6c93dc1d82
Update LSL information (Adds new AnimationOverride)
2013-04-19 23:59:05 +02:00
Lirusaito
c79487d3da
[Frosting] Modernize llpanelmsgs.* and the Popups Preferences
...
Makes the scrolllists multiselect, adds a disable button, rearranges the buttons, and maximizes vertical and horizontal use of real estate for scroll lists.
Finally notifications can easily be passed back and forth between the two lists
Removes the pointless alerts for explaining what "en/dis-able all" does. If some language needs larger explanation, there's always tooltips, but it should be obvious enough without notifications.
As for code changes, this swaps a whole bunch of static functions over to boost::bind and removes includes.
Translators will need to update panel_preferences_popups.xml (and notifications.xml)
2013-04-19 11:49:29 -04:00
Lirusaito
4cb28f1dea
Update/Sync in llviewermessage, makes more things auto-previewable, like in v3.
2013-04-19 11:21:32 -04:00
Lirusaito
8f3ff01703
Picked up changes from viewer-maint-2287
...
Adaptation of current merchant outbox project viewer to conform to Singularity's needs.
Adds the following commits by Merov Linden:
a5db366 MAINT-2287 : WIP : Implement a market place state
43fc74b MAINT-2287 : WIP : Fix compile issue
cb887fe MAINT-2287 : Fixed : Test the merchant/no merchant status without relying on outbox, Recreate missing outbox for a merchant, UI clean up on init.
f1934c0 MAINT-2301 : WIP : Catch a bit more 4xx and 5xx error codes, display the error code in the alert.
3fbbe6c MAINT-2301 : Fixed : Ignoring 499 timeout errors on POST (safe).
3dc6263 MAINT-2301 : Do not treat 404 errors (server returns not found) as 403 errors (forbidden, i.e. resident is not a merchant)
94039ee MAINT-2301 : Change messaging in the Merchant Outbox panel when an error happened, so not to be confused with the not-a-merchant case.
7c9cb2e MAINT-2452 : Fixed : Do not clear the cookie in IMPORT_DONE_WITH_ERRORS case so future retry have a chance to work.
67b872e WENG-618 : Added debug printout for POST and GET when InventoryOutboxLogging is turned on
Translators, you will need to update strings.xml and notifications.xml for this change.
2013-04-18 23:28:09 -04:00
Shyotl
7863484f10
Less prim peekaboo antics.
2013-04-18 17:25:27 -05:00
Shyotl
733b8e75ac
Less prim peekaboo antics.
2013-04-18 23:44:25 +02:00
Latif Khalifa
7e66eb08cf
Merge remote-tracking branch 'shyotl/master'
2013-04-18 23:24:40 +02:00
Lirusaito
b51615be20
Support Legacy Region/Estate Environment
...
Also Disable Environment Tab when the cap required to use it isn't supported.
2013-04-18 23:24:30 +02:00
Shyotl
0261f13670
LLSliderCtrl callbacks actually get the child LLSlider object, not the LLSliderCtrl object.
2013-04-18 16:02:10 -05:00
Shyotl
6f415118ef
LLSliderCtrl callbacks actually get the child LLSlider object, not the LLSliderCtrl object.
2013-04-18 15:54:05 -05:00
Melanie
63b7b6ddc9
Merge branch 'master' into Avination-4.0
2013-04-18 06:04:52 +02:00
Melanie
ceade84fb0
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-04-18 06:04:30 +02:00
Shyotl
d1e86e66d8
Less prim peekaboo antics.
2013-04-17 22:32:53 -05:00
Melanie
4cf8780711
Merge branch 'master' into Avination-4.0
2013-04-18 05:19:15 +02:00
Melanie
765a4749c9
Allow the octopus to set a channel at floater level to disambiguate between simultaneously open floaters
2013-04-18 05:15:34 +02:00
Lirusaito
2b3350d686
Compile fix for internal pieces accidentally staged.
2013-04-17 22:21:07 -04:00
Lirusaito
22435b4b91
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting
...
Conflicts:
indra/newview/llviewerwindow.cpp
2013-04-17 21:06:57 -04:00
Lirusaito
c9f235a5d9
French translation update
2013-04-17 21:00:32 -04:00
Lirusaito
11b4eb153c
Support Legacy Region/Estate Environment
...
Also Disable Environment Tab when the cap required to use it isn't supported.
2013-04-17 19:42:56 -04:00
Melanie
5d3f50c307
Merge branch 'master' into Avination-4.0
2013-04-18 00:45:10 +02:00
saphira
50f03d83c0
Fix SuSe Linux build break
2013-04-18 00:44:50 +02:00
Lirusaito
5ac2a23b8d
Update LSL information (Adds new AnimationOverride)
2013-04-16 20:16:44 -04:00
Latif Khalifa
110f502960
Merge remote-tracking branch 'shyotl/master'
2013-04-16 17:50:26 +02:00
Shyotl
11358746da
Use legacy function pointer for old legacy setTextEntryCallback signature.
2013-04-16 10:49:56 -05:00
Melanie
88ef66f90f
Merge branch 'master' into Avination-4.0
2013-04-16 17:49:49 +02:00
Latif Khalifa
e2a9d83b3e
Merge remote-tracking branch 'melanie_t/master'
2013-04-16 17:35:44 +02:00
Melanie
0909bf1133
Remove the spammy leftover debug message. Thought I'd done that already...
2013-04-16 14:07:34 +02:00
Melanie
2803c4ddf6
Merge branch 'master' into Avination-4.0
2013-04-16 13:33:41 +02:00
Melanie
a2f7bee568
Extend the octopus to allow avatar pickers to be used.
2013-04-16 13:32:35 +02:00
Melanie
12b98eedbe
Extend the octopus to allow avatar pickers to be used.
2013-04-16 13:20:24 +02:00
Latif Khalifa
97809b3a22
Merge remote-tracking branch 'melanie_t/master'
2013-04-16 12:53:37 +02:00
Melanie
ab2f06d64e
Add some much needed parens
2013-04-16 12:50:22 +02:00
Melanie
ab29c73ff5
Hide the export check boxes when on SL.
2013-04-16 12:35:02 +02:00
Melanie
a52fdd0dd0
Extend the octopus to allow avatar pickers - step 1
2013-04-16 12:15:43 +02:00
Melanie
f921e551a2
Merge branch 'master' into Avination-4.0
2013-04-16 07:44:55 +02:00
Melanie
f960a79118
Kill some compiler warnings by removing three unused locals that were in there for debugging
2013-04-16 07:41:12 +02:00
Shyotl
a5dad6be5c
UI cleanup.
...
-Added ui-local transformation matrix.
-Gutted legacy commitcallbacks throughout ui widget ctors.
-Created filter_editor ui widget which issues commit on keypress
-search_editor commits on focus loss/enter press
-search_editor and filter_editor now have a built in 'x' button to clear text.
-LLComboBox::setPrearrangeCallback now uses boost::function
-LLComboBox::setTextEntryCallback now uses boost::function
-LLLineEditor::setKeystrokeCallback now uses boost::function
-LLLineEditor::setPrevalidate now uses boost::function
-LLPanel::childSetKeystrokeCallback removed
-LLPanel::childSetPrevalidate removed
-LLPanel::childSetActionTextbox now uses boost::function
-LLTextBox::setClickedCallback now uses boost::function
-LLTextEditor::setKeystrokeCallback added.
-Cleaned up JCFloaterAreaSearch
2013-04-16 00:25:59 -05:00
Shyotl
4cbf8b16b6
Streaming FBO checkbox in preferences->graphics->advanced enable switch was inverted due to vbo rebuild being deferred to a later frame.
2013-04-16 00:21:12 -05:00
Latif Khalifa
c1d5f33a4c
Merge remote-tracking branch 'shyotl/master'
2013-04-16 06:36:13 +02:00
Shyotl
f52b97d588
Fix llalertdialog.cpp (accidentally grabbed some changes that only work with future alterations I've yet to push to master.)
2013-04-15 23:29:51 -05:00
Melanie
e897fbcea5
Merge branch 'master' into Avination-4.0
2013-04-16 05:46:43 +02:00
Melanie
158a434899
Set focus in all necessary ways, not just the keyboard alone, when tabs are changed by alt-arrows
2013-04-16 05:45:27 +02:00
Shyotl
fed6639e44
Renamed SHAlphaMaskMaxRMSE to SHAutoMaskMaxRMSE. Disabled alpha masking on attachments.
2013-04-15 18:16:12 -05:00
Shyotl
75c1e74e48
Avoid using invalid iterator in LLNotifications::getChannel if channel is not found.
2013-04-15 18:12:15 -05:00
Shyotl
70e008bf98
Fix some subtle bugs in llrender.
2013-04-15 18:10:38 -05:00
Shyotl
e22e8d92b8
Disable AA when drawing ui.
2013-04-15 18:09:00 -05:00
Shyotl
d51b0f8701
Tweaked alert dialogs. Clicking 'x' issues a response. Either 'close', 'cancel', 'ok' or a dummy 'close' which will result in LLNotification::getSelectedOption returning -1 in callback. Listed in order of preference.
2013-04-15 18:06:46 -05:00
Melanie
09965b0cdf
Add support for Avination's "Upload Credits"
2013-04-15 15:55:46 +02:00
Latif Khalifa
adb535421d
Fixed build with DEBUG_CURLIO defined
2013-04-13 22:08:19 +02:00
Latif Khalifa
3a54d4b4ab
Fixed windows build in debug mode
2013-04-13 22:07:45 +02:00
Melanie
0b70e32f15
Remove spammy debug - that part works now
2013-04-13 20:03:16 +02:00
Lirusaito
6f027c5535
commitCallbacks have the new value built in, let's not bother with childGetValue for the export check =^*^=
2013-04-13 20:03:05 +02:00
Lirusaito
2bc966ad24
Condensed export mask checks into boolean functions
...
Thins out that overly thick block of checks in the middle of LLPanelPermissions::refresh
Also corrected incorrect log output, after First stage comes contents not textures, Melanie.
2013-04-13 20:02:51 +02:00
Lirusaito
09e7017f06
Added handleVisibilityChange to LLPanelPermissions
...
TODO: Find out if this change is worthwhile by checking for log spam
2013-04-13 20:02:40 +02:00
Melanie
eacd1d7eb9
Fix export permission checks to look for face textures by asset ID
2013-04-13 20:01:57 +02:00
Melanie
469ef079b9
Fix export enable controls
2013-04-13 20:01:49 +02:00
Melanie
121de1fc12
Fix debug permissions display to show the transfer permission again.
2013-04-13 20:01:38 +02:00
Lirusaito
345c5c751c
Space changes
2013-04-13 20:00:38 +02:00
Lirusaito
fd76b7bf20
Added simSupportsExport function
...
Hide E and export checked from regions without export support
No longer allow PERM_EXPORT from being added to default everyone permission flags if it's not supported by the sim.
2013-04-13 20:00:17 +02:00
Lirusaito
7e7190ce6e
Such a silly mistake it's "checkbox allow export" not "checkbox export"
2013-04-13 19:59:47 +02:00
Lirusaito
5a8ab82257
Bit more cleanup in llpanelpermissions.cpp
2013-04-13 19:57:24 +02:00
Lirusaito
fec3b6c79f
Space changes
2013-04-13 19:57:17 +02:00
Lirusaito
dd711d51c0
Clean up in llpanelpermissions.cpp
2013-04-13 19:57:08 +02:00
Lirusaito
d5e6f9950d
Add Allow exportation checkbox to Default Upload Permissions floater.
...
Setting is per account and defaults to false.
2013-04-13 19:55:50 +02:00
Lirusaito
e7cf0b716d
Permissions corrections.
2013-04-13 19:55:37 +02:00
Lirusaito
d269b66623
Space changes.
2013-04-13 19:54:41 +02:00
Lirusaito
9e6e801d49
Check if objects textures prevent it from being exportable.
2013-04-13 19:54:11 +02:00
Lirusaito
c67563dfe4
Bits and pieces
...
Disable next owner perms boxes when PERM_EXPORT
Added checks disabling the export toggle conditionally.
All cases covered except textures, couldn't figure that one out...
Mind the TODO's in the diff..
2013-04-13 19:53:58 +02:00
Lirusaito
11604ae5de
Compile fixes.. I thought I'd done this...
2013-04-13 19:53:20 +02:00
Lirusaito
45f3a171be
Enter PERM_EXPORT, stage right.
2013-04-13 19:53:02 +02:00
Lirusaito
15fea2ef54
Export perm added to UI!
...
Code added, Along with all the potential PERM_EXPORT bits...
Actual PERM_EXPORT bit still needs to be added.
SimulatorFeature comes next.
2013-04-13 19:52:44 +02:00
Latif Khalifa
3005b9dd2c
Merge remote-tracking branch 'melanie_t/master'
2013-04-13 05:03:50 +02:00
Melanie
273f57d5a2
Fix chat focus issues once and for all
2013-04-13 04:59:02 +02:00
Aleric Inglewood
b5e70e11c4
Compile fix for libcwd
2013-04-12 20:55:54 +02:00
Lirusaito
8c49716eae
Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
...
Conflicts:
indra/newview/llviewerwindow.cpp - Also two compile fixes.
2013-04-10 13:26:48 -04:00
Lirusaito
fd9f8fa71f
Cleanup and Synchronization (pre-merge wrap-up commit)
2013-04-10 09:14:16 -04:00
Lirusaito
c2046025e3
Tiny fix to the Scripts sub-piemenu
2013-04-10 05:39:21 -04:00
Aleric Inglewood
734d2e658d
Rename HTTPTimeout::sClockCount (in clock ticks) to sTime_10ms (in 10ms units).
...
Note that HTTPTimeout::sClockWidth is no longer used for HTTPTimeout (as
if it's value became a constant of 0.01, the fraction 10ms / 1s).
A new variable, HTTPTimeout::sClockWidth_10ms is used to calculate
sTime_10ms (only).
Also HTTPTimeout::mStalled and HTTPTimeout::mLowSpeedClock changed units
to the same as of sTime_10ms (time since epoch in 10ms units).
2013-04-09 22:27:23 +02:00
Latif Khalifa
99bda78f37
Merge commit 'e9330f8a8752d6b6effce438204cd0d2e69a1d0f'
2013-04-09 19:56:55 +02:00
Latif Khalifa
9f897f0e2c
Merge remote-tracking branch 'upstream/release'
2013-04-09 19:52:13 +02:00
Drake Arconis
eb25270df0
Only Aurora supports not having a last name. So lets just default it to Resident.
2013-04-09 10:51:11 -04:00
Drake Arconis
e9330f8a87
This should fix OSX blah blah
2013-04-09 08:12:13 -04:00
Lirusaito
b909a70413
[Frosting] Feature Request: Add Scripts sub-piemenu
...
Thanks in part to the FS team for already having something close, that made adding this all easier~
2013-04-09 00:31:00 -04:00
Lirusaito
f11f6618ab
[Frosting:268] Sit via self pie menu
2013-04-09 00:25:42 -04:00
Aleric Inglewood
fce106f7e2
PerHost became PerService
...
Reflect the fact that we include port number in its name.
2013-04-09 05:06:32 +02:00
Aleric Inglewood
29a1d0e4e1
Renamed aicurlperhost.{cpp,h} --> aicurlperservice.{cpp,h}
...
Next commit will rename everything else.
2013-04-09 04:40:47 +02:00
Aleric Inglewood
bb948ce6d5
Use host:port as key for the "PerHost" request queue, instead of just the hostname.
...
Rationale: LL is doing all throttling per service (host:port), not per
service hostname. Also, textures and capabilities use the same host: the
sim you are connected to. Splitting the queues up on a per-service basis
will stop the textures from blocking a capability request.
2013-04-09 04:32:36 +02:00
Aleric Inglewood
3af89dd685
Temporarily add old bandwidth throttle method back.
2013-04-09 04:25:28 +02:00
Aleric Inglewood
748d339ee6
Move decision whether or not to add new HTTP request from texture fetcher to AICurl
...
After commit things compile again :).
The HTTP bandwidth throttling is not yet implemented. I'll put a
temporary fix back the next commit that just does it the "old way"...
2013-04-08 22:46:01 +02:00
Aleric Inglewood
8d6f5c6ffc
Compile error fix.
...
Cannot pass non-trivially copyable type std::string through '...'.
2013-04-08 19:54:07 +02:00
Aleric Inglewood
9cc801f669
Added LLTextureFetchWorker::PerHostPtr
...
Points to the AIPerHostRequestQueue instance corresponding to the
hostname in LLTextureFetchWorker::mUrl. This is basically a cache as we
could of course just retrieve that instance from mUrl at any time,
everytime. Needed in a future commit.
2013-04-08 06:41:08 +02:00
Aleric Inglewood
79bcb1ec07
Print info in texture console about curl request queuing
...
This includes also non-texture requests (not sure if it's worth it to
explicitely separate this data for just textures).
The texture console now prints: HTTP:c/q/a/r
Where, c = number of 'add' request commands in the command queue
(minus the number of 'remove' request in the command queue and not
taking into account the command_being_processed, nor entirely being
thread-safe with regard to adding requests to 'q' or 'a' next: it is
possible that a request is no longer counted in 'c' but not yet is added
to 'q' or 'a'.
q = number of queued (throttled) requests (by the curl thread).
a = number of actually added requests (to the multi handle).
r = last returned value of 'running handles' by libcurl.
Obviously, c and q should be small (0 or 1) most of the time and a and r
should be equal and maxed out. This turns out to be the case.
2013-04-08 06:41:07 +02:00
Aleric Inglewood
c20e33c7f4
Added AIPerHostRequestQueue::queued_commands()
...
Returns the number of add commands minus the number of remove commands
in the command_queue for this host.
2013-04-08 06:41:07 +02:00
Aleric Inglewood
d26241c0f2
Move extract_canonical_hostname to AIPerHostRequestQueue::extract_canonical_hostname.
...
This to make it available to the texture fetcher.
2013-04-08 06:41:07 +02:00
Aleric Inglewood
7866c68ab2
Moved PerHostRequestQueue[Ptr] outside of AICurlPrivate.
...
Renamed PerHostRequestQueue and PerHostRequestQueuePtr to
AIPerHostRequestQueue and AIPerHostRequestQueuePtr respectively and
moved them to global namespace. This in preparation for using them in
the texture fetcher (as function of the hostname of the url that is
contructed there).
2013-04-08 06:41:07 +02:00
Aleric Inglewood
db7c378160
Added MultiHandle::sTotalAdded
...
This new variable is updated to contain the total number of requests in
MultiHandle::mAddedEasyRequests. It can be a static because MultiHandle
is a singleton (there is only one curl thread) and it has to be an
(atomic) static because we don't want to need to take the lock on
MultiHandle for accessing this variable.
2013-04-08 06:40:48 +02:00
Aleric Inglewood
6c9b136d32
Removal of HTTPRequestRate and dead code.
2013-04-08 06:39:52 +02:00
Aleric Inglewood
17455e2442
Add PerHostRequestQueue::sTotalQueued
...
The new variable is updated to contain the sum of the size of
PerHostRequestQueue::mQueuedRequests of every PerHostRequestQueue
object, and thus the total number of queued requests for all hosts
together.
Also added PerHostRequestQueue::host_queued_plus_added_size() which
returns the the sum of queued requests plus the requests already added
to the multi handle for this particular hostname.
2013-04-08 06:39:52 +02:00
Aleric Inglewood
f58bc148ba
Add a 'size' to command_queue.
...
This adds a size (command_queue_st::size) to the ThreadSafe deque<Command> that was
AICurlPrivate::command_queue that is kept equal to the number of 'add'
commands in the deque minus the number of 'remove' commands in the
deque. The deque itself is now command_queue_st::commands.
2013-04-08 06:39:51 +02:00
Aleric Inglewood
07201a5cfe
Add AICurlInterface::getNumHTTPRunning
...
Replaces LLTextureFetch::getNumHTTPRequests.
Returns AICurlInterface::Stats::running_handles.
This is work in progress that temporarily doesn't compile because
LLTextureFetch::getNumHTTPRequests is still being used somewhere.
2013-04-08 06:39:06 +02:00
Latif Khalifa
59a7c1cd9c
Fixed windows build with the latest cmake
2013-04-06 17:59:42 +02:00
Latif Khalifa
fc4fcc9450
Merge remote-tracking branch 'shyotl/master'
2013-04-06 09:26:23 +02:00
Shyotl
b16bb264cc
Added an experimental new alphamask detection method(set SHUseRMSEAutoMask to TRUE to use. Adjust SHAlphaMaskMaxRMSE to tweak cutoff). Fixed per-frame sky updates hammering analyzeAlpha.
2013-04-06 02:04:46 -05:00
Latif Khalifa
5ad2e32712
Merge remote-tracking branch 'lirusaito/master'
2013-04-05 23:11:30 +02:00
Nyx Linden
987ab9c07f
SH-4059 FIX other's hover parameters affects your avatar's setting
...
Added an additional sanity check to make sure that other avatars don't
affect your wearables.
2013-04-05 23:10:17 +02:00
Nyx Linden
1a3e2ff18e
SH-4050 FIX camera goes below ground when avatar offset set to 0
...
Added a constraint to ensure that the avatar's height (with offset)
does not go below 0.1 meters. Camera was getting confused since the avatar's
effective height was negative.
Note the avatar is mostly underground/contorted even at 0.1 meters, but
most users setting values this low will be making ultra-tinies and would
be hiding the avatar mesh. Camera stays above ground when height is at 0.1.
Conflicts:
indra/llappearance/llavatarappearance.cpp
2013-04-05 23:10:16 +02:00
Nyx Linden
add9bb9945
SH-4044 FIX voice dot is offset vertically if using avatar height offset
...
Added the height offset in one too many places. fixing.
2013-04-05 23:10:16 +02:00
Lirusaito
da55a4a51c
Fix Issue 726
...
Instead of focusing the chat bar when the chat history floater is visible, focus it onFocusReceived
This avoids the floater grabbing focus when returning from mouselook.
2013-04-04 18:31:35 -04:00
Lirusaito
fda82da3e9
Made mClickActionBuyEnabled and mClickActionPayEnabled CachedControl members, so they can be changed without a restart.
2013-04-03 08:23:23 -04:00
Lirusaito
0969f72bad
Fix a bug in the pie menu, in v3 there is a separate pie menu for others' attachments, we don't have this yet.
2013-04-03 08:21:42 -04:00
Lirusaito
d064a54be3
[Frosting:288] Ability to left-click sit on one's own objects only.
...
Debug Settings DisableClickSitOtherOwner added.
Checkbox added to System Preferences for disabling click-to-sit on objects you don't own.
Also redid onCommitCheckBox a bit, best viewed without space changes.
There's more to this feature, but it doesn't work yet.
2013-04-02 18:54:16 -04:00
Latif Khalifa
82ecdd1079
Merge remote-tracking branch 'lirusaito/master'
2013-04-01 17:14:56 +02:00
Latif Khalifa
1fe3bf8357
Align whitespace with upstream in hope of avoiding future merge conflicts
2013-04-01 15:19:48 +02:00
Latif Khalifa
7e11ab9e95
Merge remote-tracking branch 'shyotl/master'
2013-04-01 14:44:07 +02:00
Latif Khalifa
7c7722a049
Merge remote-tracking branch 'aleric/master'
2013-04-01 14:43:59 +02:00
Siana Gearz
6d0fee3de9
War on ugly icon in inventory
2013-04-01 10:08:03 +02:00
Siana Gearz
9ce24b7ec5
Someone forgot to compact the wolf remote
2013-04-01 07:09:19 +02:00
Lirusaito
d3dce27077
[Frosting:268] Quick fixes to LLViewerMenu
...
Fixes Stand Up slice not being hooked up in attachment menu
Translators, please update the pie menu accordingly. userdata="Translate,These"
Also fixes an instance where Continue Flying On Unsit would be ignored
2013-03-31 19:48:34 -04:00
Shyotl
e2255f419d
Commented out a spammy llinfos message.
2013-03-30 01:26:30 -05:00
Shyotl
b07ab02f54
Added blendfunc checks when RenderDebugGL is TRUE.
2013-03-30 01:26:07 -05:00
Shyotl
03272c8875
Clamp LLMeshSkinInfo::mJointNames to a max of 64 entries. Also checking size in lldrawpoolavatar(Redundant checks added to just match similar logic LLRiggedVolume::update more closely.)
2013-03-30 01:01:53 -05:00
Shyotl
1965224912
Stabbed some blendfunc state issues. This fixes some ui flicker which popped up recently (perhaps after merging, or I just never noticed it before then)
2013-03-30 00:57:49 -05:00
Nyx Linden
2d6bc052ab
SUN-57 SH-4039 FIX bake fail on non-ssb regions
...
We were getting the texture ID from the type,index couple, but were not
passing in index, which defaulted to 0. texture ID is available from the
texture object itself, so using that and removing the index parameter
to prevent future confusion.
Conflicts:
indra/newview/llvoavatarself.cpp
2013-03-30 00:42:43 +01:00
Brad Payne (Vir Linden)
201647e1cf
SH-4001 FIX - made local texture loading universal.
...
Conflicts:
indra/newview/llvoavatarself.cpp
2013-03-30 00:37:21 +01:00
Latif Khalifa
20fe807271
First re-apply "SH-3941 SH-3954 FIX local appearance does not update properly"
2013-03-30 00:30:07 +01:00
Lirusaito
b3c78b0ca5
Fix ups for 6525ccc384
...
If log_path is empty, we shouldn't setChatLogsDir to it.
In fact, this may have been the cause of something Nomade Zhao brought up.
Also, InstantMessageLogPathAnyAccount was accidentally being set as a PerAccount
2013-03-29 15:53:30 -04:00
Lirusaito
401ea93b57
ToolPie Frosting
...
Easiest read with Copy/Move detection and no space changes
Adds debug settings: DragAndDropDistanceThreshold, EnableGrab, ClickToWalk, ClickActionBuyEnabled, ClickActionPayEnabled
ClickToWalk was redefaulted to false, though if you are curious enough to read this, you should give it a try, it takes some getting used to but it might be fun.
2013-03-29 03:56:26 -04:00
Lirusaito
126eeb9244
Inventory Updates and Clean Up
...
Better viewed without space changes
Adds translatable inventory strings
2013-03-29 03:25:03 -04:00
Lirusaito
e44ba343a6
Further LLViewerMenu updates
2013-03-29 03:01:18 -04:00
Lirusaito
dff59ab455
Fix Issue 719: Calling Cards can be opened more than just one at a time
2013-03-29 01:18:48 -04:00
Aleric Inglewood
c14601f7c2
Avoid assertion in ~AIStateMachine upon viewer exit.
...
Force the state to bs_killed before clearing the list of statemachines
in AIEngine::flush().
2013-03-28 03:01:27 +01:00
Aleric Inglewood
ac84e02018
Do not use a timer for HTTP get in LLTextureFetchWorker::doWork
...
All HTTP timing is done by AIHTTPTimeoutPolicy.
Inside LLTextureFetchWorker::doWork when mState == SEND_HTTP_REQ,
mCanUseHTTP is true, throttling is not in effect and mURL is not empty,
mLoaded is set to FALSE, mState is set to WAIT_HTTP_REQ and
LLHTTPClient::request is called that starts the download by curl.
A call back to LLTextureFetchWorker::callbackHttpGet is guaranteed,
which causes mLoaded to be set to TRUE (HTTPGetResponder::completedRaw
calls LLTextureFetchWorker::callbackHttpGet which sets mRequestedSize to -1
(if there was an error) and mLoaded to TRUE).
Being in state WAIT_HTTP_REQ, once mLoaded == TRUE (and mRequestedSize
is -1), the different timeout errors are handled.
2013-03-27 22:37:21 +01:00
Aleric Inglewood
bbf24b4994
Indentation fix.
2013-03-27 21:45:09 +01:00
Lirusaito
d7c4ce6b0a
Spanish translation fixies
2013-03-27 14:50:04 -04:00
Lirusaito
cce43326c3
French translation touchup
2013-03-27 14:20:44 -04:00
Latif Khalifa
f63286b333
Merge remote-tracking branch 'shyotl/master'
2013-03-27 10:16:30 +01:00
Shyotl
92cc65bf5e
Decoupled rlva/setting based z-offset from param based z-offset. This reverts questionable changes introduced in the recent rlva merge.
2013-03-27 01:36:23 -05:00
Shyotl
60f1bada3d
Undo a bit of regression in llphysicsmotion
2013-03-26 23:10:26 -05:00
Aleric Inglewood
41a0681768
Revert "Snapshot floater aesthetics"
...
This reverts commit 63dcd7ba32 .
That commit is nonsense and only shows that Liru has no clue what he is
doing when it comes to the snapshot stuff :/.
And no, I wasn't even AWARE he made this commit, I was just happily
exploring and wanted to make a few snapshots when I suddenly noticed
that several things were BROKEN: the aspect that the fullscreen preview
was shown with was wrong, and when I wanted to limit the aspect of my
feed upload that wasn't possible anymore ?!?!?? WTF
Please don't screw up the hard work of others without at LEAST first
consulting them.
2013-03-27 02:22:48 +01:00
Aleric Inglewood
fa05647068
Compile fix
2013-03-27 00:56:28 +01:00
Latif Khalifa
303840f729
Merge remote-tracking branch 'shyotl/sunshine'
...
Conflicts:
indra/llappearance/llavatarappearance.cpp
indra/newview/character/avatar_lad.xml
indra/newview/llagent.cpp
2013-03-26 23:54:36 +01:00
Aleric Inglewood
779f697ffb
Fix yield_ms().
...
This fixes
https://code.google.com/p/singularity-viewer/issues/detail?id=714
The problem was a typo in AIStateMachine::sleep, >= should have been <=
which caused a state machine that uses yield_ms() to never run anymore
when next run it already should have run again. AIFilePicker is the only
state machine that currently uses yield_ms and I hadn't spotted this
because I don't have plugin messages on by default which made my viewer
just that much faster that it the yield never expired the first run
already (causing it to expire immediately).
The rest of the changes in this commit are just minor improvements /
conformation to the EXAMPLE_CODE in aistatemachine.cpp.
2013-03-26 23:30:04 +01:00
Lirusaito
b80a509ae2
Fix Issue 702: Copy Paste Parameters glitch
...
Also improves the related code.
It seems the main problem was calling updateVolume before setting sculpt params because this call relies on the isSculpted()
2013-03-26 18:16:50 -04:00
Aleric Inglewood
524fdf033d
Merge remote-tracking branch 'singu/master'
2013-03-26 21:10:00 +01:00
Shyotl
441b564afe
RLVa update.
2013-03-26 00:46:11 -05:00
Shyotl
1705167998
Fixed non-debug compile.
2013-03-24 23:20:40 -05:00
Aleric Inglewood
b20886a481
Allow TOS redirect. Fix upload finished detection when redirecting.
...
This fixes https://code.google.com/p/singularity-viewer/issues/detail?id=705
Adds 'bool redirect_status_ok(void) const { return true; }' to LLIamHere,
because it's ok to receive a 302 status there. Likewise added to LLIamHereVoice,
because that has the same comment in its error() method.
Also fixes the problem that if two redirects occur on a row, then the
upload_finished detection asserted because it would detect the third
time that libcurl turned off writing to the socket as a failure (the
second time wasn't a problem because mUploadFinished was reset upon
receiving the first 302 header, but not upon receiving the second
header).
2013-03-25 04:41:07 +01:00
Lirusaito
16babd38e0
Phantom Avatar no longer works, not on SL, not on OpenSim. Bye Phantom~
2013-03-24 12:44:29 -04:00
Lirusaito
7aa0b439a8
Updates and clean up and frosting, oh my~
...
Removes old code for permitting emerald attachment points
Removes other old dead code...
Updates RLVa a bit.
Adds more translation flexibility via strings.xml
2013-03-24 12:29:58 -04:00
Latif Khalifa
cfa3766bc7
Quick fix for the Mac build.
...
TODO: Make this version dependant so it works with newer Xcode too
2013-03-24 17:11:03 +01:00
Latif Khalifa
ea4f2ec7a7
Merge remote-tracking branch 'origin/sunshine2'
2013-03-24 14:23:18 +01:00
Latif Khalifa
97c340be54
Merge remote-tracking branch 'lightdrake/CupCake'
2013-03-24 14:22:44 +01:00
Latif Khalifa
afc137bb3f
Merge remote-tracking branch 'aleric/master'
2013-03-24 14:22:28 +01:00
Latif Khalifa
db497ccf57
Merge remote-tracking branch 'lirusato/Frosting'
2013-03-24 14:22:02 +01:00
Aleric Inglewood
2916d9353e
Comment fix.
2013-03-23 22:22:38 +01:00
Aleric Inglewood
d526d388ef
Make AIRegisteredStateMachines more robust.
...
Now that a call to cont() can schedule a run of the statemachine, we
need this change to make it robust (the comment that cont() does never
access mRegisteredStateMachines no longer holds).
2013-03-23 22:17:27 +01:00
Drake Arconis
43ed77f4d5
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake
2013-03-23 11:05:20 -04:00
Latif Khalifa
ef6549ce32
Set default network buffer size to 6000ms for music streaming
2013-03-22 22:43:31 +01:00
Latif Khalifa
f1cf73b8af
Reverted addition of soon to be obsolete way of setting z offset to quick prefs
2013-03-22 22:40:37 +01:00
Latif Khalifa
40133643c0
Revert "SH-3941 SH-3954 FIX local appearance does not update properly"
...
This causes SUN-57
This reverts commit 707f3959f9 .
2013-03-22 21:52:17 +01:00
Drake Arconis
91b3cdde39
Unbreak non-debian derived and standalone linux
2013-03-21 16:55:25 -04:00
Aleric Inglewood
712c46a74e
Add comment with regard to LLSD in the body of pages with an HTTP error code.
2013-03-21 20:56:21 +01:00
Aleric Inglewood
835240fda1
Fix crash in LLTextureFetch::getWorker upon viewer exit.
...
This is now necessary since the curl thread no longer syncs with the
main thread: it is possible that a request finishes after a texture
fetch thread was shot down but before curl was stopped, and curl
calling BufferedCurlEasyRequest::processOutput while objects that the
responder uses were already destructed (most notably
LLTextureFetch itself).
2013-03-21 20:26:01 +01:00
Aleric Inglewood
00b223f2a4
Do not request empty folders.
...
Doing this resulted in a 404 on Aditi, and although that was a server
bug; it still doesn't seem to make much sense to do the request in the
first place.
2013-03-20 22:51:11 +01:00
Lirusaito
212faab988
Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
2013-03-20 09:01:37 -04:00
Lirusaito
f87a967c0d
Pathfinding UI: Fix the open with selection via pie menu bug.
...
Also comments out an unnecessary excess call.
2013-03-20 08:37:06 -04:00
Drake Arconis
5dd957f117
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into Cupcake
2013-03-20 08:31:21 -04:00
Drake Arconis
0eeddb0607
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake
...
Conflicts:
indra/newview/llappviewer.cpp
2013-03-20 08:31:04 -04:00
Lirusaito
c2b3322594
Pathfinding UI: Hide Capsule doesn't seem to work without havok
2013-03-20 08:30:36 -04:00
Aleric Inglewood
4be1d057bc
Fix windows compile warnings.
2013-03-19 23:59:15 +01:00
Aleric Inglewood
06730d1a7e
Fix recursive calls to LLWaterParamManager::initSingleton and LLWLParamManager::initSingleton
2013-03-19 22:44:01 +01:00
Aleric Inglewood
fc642019b3
Fix recursive call to LLNotifications::initSingleton
2013-03-19 19:56:20 +01:00
prep
7ef75fef4f
Fix for sh-4014. This was a regression caused by fix for sh-3650.
2013-03-19 19:20:06 +01:00
prep
45e6c3f2e4
modified_cof_cb() issues a updateAppearanceFromCOF() right before this function - removed extra update call. Sh-3650 & Sh-3985
2013-03-19 19:19:17 +01:00
Nyx Linden
707f3959f9
SH-3941 SH-3954 FIX local appearance does not update properly
...
We were using an indicator of whether there *was* a baked texture to whether we
were *using* a baked texture. Switched to one of the (several) proper indicators
of whether a baked texture was in use. This should allow local texture data to
get marked for download when we enter appearance mode.
Local testing confirms that old apperances linger for a second or two, but are
soon replaced by the correct local renders.
2013-03-19 19:13:51 +01:00
Nyx Linden
554a03d569
SH-3649 WIP newly created pants do not show up on mac/windows.
...
Added an initializer for the wearable definition version when creating a new wearable.
Should fix the issue but need to test.
2013-03-19 02:20:58 +01:00
Nyx Linden
0866685971
SH-3954 SH-3941 SH-3910 FIX local appearance does not update
...
We suppress texture downloads for local textures not needed with server side
baking. We need to explicitly re-set texture priority for local textures
when entering appearance mode.
2013-03-19 02:20:17 +01:00
Brad Payne (Vir Linden)
bb528a4398
Periodic log messages to explain why user is still clouded, if they are
2013-03-19 02:19:53 +01:00
Brad Payne (Vir Linden)
4179730552
Increase number of retries for requestServerAppearanceUpdate()
2013-03-19 02:14:40 +01:00
Nyx Linden
9ff1c8b879
SH-3798 FIX avatar skins look dull
...
Wearable parsing error caused last texture in some assets to fail to parse.
Parser now does not throw an error if the wearable does not end in a newline
2013-03-19 02:09:23 +01:00
Nyx Linden
07850410b5
SH-3909 Support avatar height offset
...
Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.
Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
Conflicts:
indra/newview/character/avatar_lad.xml
indra/newview/llagent.cpp
indra/newview/llcallingcard.cpp
indra/newview/skins/default/xui/en/strings.xml
2013-03-19 02:06:22 +01:00
Shyotl
13d55cbeba
Changed several setting lookups to cachedcontrols in LLAgentCamera
2013-03-14 14:38:23 -05:00
Shyotl
1dbaa19e99
Reworked control variable lookup profiling. Should practically be free, and is now enabled for relwithdebinfo. Use dumpcalls for output.
2013-03-14 14:37:20 -05:00
Lirusaito
b0459b08b6
Fix up a bunch more run-time UI warnings.
2013-03-14 05:24:10 -04:00
Drake Arconis
20cdb35172
Import some changes from internal
2013-03-12 06:03:06 -04:00
Drake Arconis
9bce5d479a
Merge remote-tracking branch 'Lirusaito/master' into Cupcake
2013-03-12 01:47:14 -04:00
Drake Arconis
ce7966b750
Merge remote-tracking branch 'Lirusaito/Frosting' into Cupcake
2013-03-12 01:36:59 -04:00
Lirusaito
655e0bc30d
Apollo skin upkeep
2013-03-12 01:27:06 -04:00
Lirusaito
2ae966fe6b
Strings fix ups
...
Order was a little incorrect
Minor change to hippogridmanager.cpp
2013-03-12 01:26:19 -04:00
Drake Arconis
e08f4316ab
New lsl function added
2013-03-12 01:08:03 -04:00
Lirusaito
ca71bf00c2
Fix for Issue 694, use gSavedSettings instead of restricting globals.
...
Removes gAllowTapTapHoldRun and not much else we may want to remove a few more in the future, though.
2013-03-12 01:04:09 -04:00
Drake Arconis
98641d5d54
Fix small copy paste buggy
2013-03-12 00:59:24 -04:00
Drake Arconis
aac7fa84c2
Added per skin lsl highlighting and move function color to an actual color
2013-03-12 00:46:18 -04:00
Drake Arconis
e93bddcbed
Update lsl keywords
2013-03-12 00:45:47 -04:00
Drake Arconis
d345630b2c
Merge remote-tracking branch 'Aleric/master' into Cupcake
2013-03-11 19:55:38 -04:00
Drake Arconis
8c09a3c6af
Rip out emerald boob physics
2013-03-11 19:21:45 -04:00
Drake Arconis
e6ee833d45
Add in droid sans license file
2013-03-11 03:44:32 -04:00
Aleric Inglewood
7de15e7acd
Update AIHTTPTimeoutPolicy objects when their base changes.
...
Actually propagate changes to CurlTimeout* Debug Settings to the timeout policy objects.
2013-03-10 20:59:48 +01:00
Aleric Inglewood
5a8308109b
Lowered CurlTimeoutLowSpeedLimit from 56 kB/s to 7 kB/s.
...
This value really IS in bytes/s (not for the total), and apparently 56
kB/s is too optimistic. The value was used by LL for transfers that went
beyond the total download time (2 minutes?), adding enough seconds per
received bytes to the timeout to allow a download at 56 kB/s to finish.
Our meaning is different however: we time out immediately and whenever
the download drops below this speed.
Perhaps a better algorithm is where the speed demand is based on the
total size of the download, but I'm not sure we always know the size of
downloads at this point.
2013-03-10 17:45:39 +01:00
Aleric Inglewood
7dfef31469
Possible upload timeout improvement.
...
When uploading finishes, but is not detected, the timeout should be for
"reply delay", the time that the server takes before it replies, and not
CurlTimeoutLowSpeedTime. This patch adds code that takes this failure
into account (which happened only ONCE for me on Metropolis while flying
around and using trickle (not sure if that is relevant), so it's not
that likely to improvement anything in practise. Note that it is
detected by an assertion when it happens, so that we can safely assume
it normally never happened on SL).
* Generalized PUT / POST configuration by adding
CurlEasyRequest::setPut, which now also supports keep-alive (which
still isn't used).
* Upload content length is now stored in CurlEasyRequest::mContentLength
* CurlEasyRequest::has_stalled() now return false if it was possbile
that the 'upload finished' detect failed AND calls upload_finished()
itself in that case, so it is no longer 'const'.
* If low speed is detect exactly when the last bytes are being attempted
to be sent (unlikely scenario), then the upload gets 4 more seconds
after which is switches to CurlTimeoutReplyDelay.
* Added EDoesAuthentication and EAllowCompressedReply to replace
booleans, for readability and type-safety, as did EKeepAlive. Note
that this change inverts the meaning of the compression related parameter.
* Unrelated: removed an unnecessary #include "llurlrequest.h" from
llxmlrpcresponder.h
2013-03-10 16:43:15 +01:00
Aleric Inglewood
96d302aa42
Be more verbose about internal (curl / timeout) errors.
...
Translates the CURLE_WRITE_ERROR into what it really means: that the low
speed check failed.
2013-03-09 05:26:52 +01:00
Aleric Inglewood
df93ebb8f6
Bug fix for AIStateMachine.
...
When a state machine is aborted after it switched to bs_initialize,
but before it executed initialize_impl(), then we should set the
state back to bs_reset and abort cleanly by switching to bs_killed
and then handle that. Before the state was set to bs_abort, resulting
in calling abort_impl(), finish_impl(), the call back and unref()
for an not initialized state machine! (detected by the assert that
makes sure that ref()/unref() are called in balance).
2013-03-09 04:20:54 +01:00
Lirusaito
d2c7ee8b45
Warning fixfix~
2013-03-08 14:51:17 -05:00
Aleric Inglewood
50caf98cd6
Dont enter AIStateMachine::multiplex recursively.
2013-03-08 16:58:25 +01:00
Lirusaito
78e1804381
Add Pathfinding UI from v3
...
Added libpathing to LLPHYSICSEXTENSIONS_INCLUDE_DIRS
llviewermenu updated a bit to be closer to v-d/rlva. Best viewed without space changes.
Updated llresmgr.cpp from v-d to "handle special case of input value being zero"
pipeline update: hideObject, restoreHiddenObject, hideDrawable, and unhideDrawable added.
Thanks to Henri Beauchamp for some UI code touchups, thanks to Zi Ree for Rebake notification.
Thanks to Mobius Ryba and Ansariel Hiller for the V1-style pathfinding icons.
Note: When opening from pie menu object selection is lost, unless the floater is already open..
This provides a more reliable reproduction of the bug we've been having with inspect.
2013-03-08 03:17:11 -05:00
Lirusaito
95bd81ee7e
Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
2013-03-08 02:57:48 -05:00
Lirusaito
06a73061ce
More UI warnings fixup stuffs
2013-03-08 01:20:15 -05:00
Aleric Inglewood
933ca23348
Bug fix for ASSERT(previewp->mFormattedUpToDate || ret == SIZE_TOO_LARGE || ret == ENCODING_FAILED)
2013-03-08 03:37:00 +01:00
Lirusaito
bede980527
Fix Issue 689: ATTACH_NECK and ATTACH_AVATAR_CENTER are missing strings
2013-03-07 20:58:15 -05:00
Lirusaito
63dcd7ba32
Snapshot floater aesthetics
...
Restores the cancel button with new functionality! In Freeze mode, it will exit freeze! Otherwise it will just close the floater as it used to do.
Lines up everything nicely, and removes overly complex tool tips.
Does not change or remove any existing functionality.
2013-03-07 20:43:33 -05:00
Aleric Inglewood
e8ef74156a
Added print_statemachine_diagnostics
...
The responder name is now cached in LLURLRequest
(ResponderBase::getName() must return a string literal).
The run time (in the main thread) per state machine is now accumulated
in AIStateMachine (instead of AIEngine::QueueElement).
When AIStateMachine::mainloop runs longer than StateMachineMaxTime
then a warning is printed that now includes the time spent in the
slowest state machine (that frame) and (if it is a LLURLRequest)
what the corresponding responder is. Also the total accumulated run
time of that state machine is printed.
From this is can be concluded that the only responder currently
regularly holding up the main thread is LLMeshLODResponder (mostly 30 to
100 ms, but with spikes in the 1 to 2 second range some times).
2013-03-08 01:50:02 +01:00
Aleric Inglewood
e3f4022ffa
Merge remote-tracking branch 'singu/master'
...
Conflicts:
indra/newview/llvoavatar.cpp
Bug fix is no longer needed.
2013-03-07 16:53:15 +01:00
Drake Arconis
b4356107ed
Updated droid sans to current version
2013-03-07 10:46:39 -05:00
Aleric Inglewood
dd42577a2a
Fix crashlogger wrt AIEngine.
2013-03-07 13:50:36 +01:00
Aleric Inglewood
f52e055414
Merge branch 'master' into curlthreading4
2013-03-07 13:49:42 +01:00
Aleric Inglewood
65d750b190
Add CPU cycles to AIStateMachine in the crashlogger
...
Also removes unused Debug Setting CurlMaximumNumberOfHandles.
The maximum number of handles is limitted by
CurlMaxTotalConcurrentConnections.
2013-03-07 13:44:40 +01:00
Lirusaito
661e135778
Restore DEV-12255 patch
...
Refresh the snapshot when calling show after instance exists (IE: Via Keyboard shortcut)
Should never have been removed in the first place, the purpose of 7faa19b297 was to have an explicit click to refresh, this patch requires an explicit click.
This does NOT break keeping the same snapshot while switching settings
2013-03-07 07:44:38 -05:00
Drake Arconis
f6713559e9
Some minor llfont cleanup..more to come
2013-03-07 01:41:42 -05:00
Drake Arconis
394d8afa17
Well this explains why fonts look like ass in v3
2013-03-06 23:42:14 -05:00
Aleric Inglewood
4e0269b3d0
Bug fix in debug code.
2013-03-07 05:23:23 +01:00
Aleric Inglewood
58c07f8054
Don't return from abort() until the current execution, if any, finished.
2013-03-07 04:20:17 +01:00
Aleric Inglewood
380eec10fb
Initialize mDebugRefCalled on restart.
2013-03-07 02:23:23 +01:00
Aleric Inglewood
b9b5f13624
Run HTTPGetResponder in any thread.
...
This fixes a bug where unref() was called when a state machine was
aborted before it reached bs_initialized. Debug code was added to detect
errors related to that.
In order to run HTTPGetResponder in any thread, I needed direct access
to LLHTTPClient::request, so I had to move that to the header file,
and therefore had to move ERequestAction from LLURLRequest to
LLHTTPClient to avoid include problems.
With this, textures are fetched with no latency: call to
LLHTTPClient::request runs all the way till the state machine is idle
(AICurlEasyRequestStateMachine_waitAdded). There is small delay till the
curl thread wakes up, which then processes the request and opens the url
etc. When the transaction is finished, it calls
AIStateMachine::advance_state(AICurlEasyRequestStateMachine_removed_after_finished)
which subsequently doesn't return until the state machine is completely
finished (bs_killed). The LLURLRequest isn't deleted yet at that point
because the AITimer of the LLURLRequest runs in the main thread: it is
aborted, but only the next time the main thread state engines run that
is deleted and the timer keeps an LLPointer to it's parent, the
LLURLRequest, so only then the LLURLRequest object is destructed. This
however has nothing to do with the texture-bandwidth loop.
2013-03-07 01:52:21 +01:00
Lirusaito
6153beabff
Fix logic in toggle_active_speakers.
2013-03-06 05:06:36 -05:00
Lirusaito
00e5fc1632
Byebye run-time warnings from llgivemoney.cpp
2013-03-05 22:15:53 -05:00
Aleric Inglewood
4cd7dec92b
Merge branch 'master' into curlthreading4
...
Conflicts:
indra/aistatemachine/aistatemachine.cpp
indra/aistatemachine/aistatemachine.h
indra/llmessage/aicurleasyrequeststatemachine.cpp
2013-03-06 03:34:05 +01:00
Aleric Inglewood
c4dceaf3e9
Rewrite of AIStateMachine, version 2.
2013-03-06 03:26:43 +01:00
Lirusaito
32b513a025
Finish up last commit
...
Fixes the segfault that was accidentally overlooked because voice decided to not return after the first run as I worked on all the other warnings
Thanks to Latif Khalifa for the VoiceMultiInstance debug setting which enabled me to use voice again.
2013-03-05 20:56:14 -05:00
Lirusaito
db39bab95b
Fix a ton of run-time warnings about UI.
...
Cleans up some related code, probably looks nicer with space changes off.. though this is a pretty straightforward change.
Comments out code that still exists in xmls or might likely be added in future.
Each piece tested quite a bit.
2013-03-05 20:20:59 -05:00
Drake Arconis
565786ead1
Cleanup unused things
2013-03-05 13:35:58 -05:00
Drake Arconis
0e3a9b28bd
CMake cleanup and organization
2013-03-05 12:24:51 -05:00
Drake Arconis
28eec629ec
Remove executable bit from xml
2013-03-05 10:17:08 -05:00
Drake Arconis
bc2d26464f
Remove dead code
2013-03-05 09:08:47 -05:00
Drake Arconis
e725a2915e
Fix typo in local asset browser
2013-03-04 21:59:04 -05:00
Aleric Inglewood
d1d09d7c18
Bail out instead of crash when parseTEMessage fails.
2013-03-05 03:51:45 +01:00
Drake Arconis
5cf556fa09
And now it actually compiles...
2013-03-04 18:05:21 -05:00
Drake Arconis
c718bc4214
Make the actual skin folders lowercase
2013-03-04 17:10:19 -05:00
Drake Arconis
6e72ec2e12
Fix rigged mesh stack smashing
2013-03-04 16:13:58 -05:00
Drake Arconis
3fac86158c
General cleanup of unused variable warnings
2013-03-04 16:04:05 -05:00
Drake Arconis
17067de2dc
Fixed uninitialized warning in hacd
2013-03-04 16:00:00 -05:00
Drake Arconis
b667c81f84
Merge remote-tracking branch 'Lirusaito/Canon' into Cupcake
2013-03-04 12:17:41 -05:00
Drake Arconis
b800320a49
Remove LLMemType and related files
2013-03-04 12:02:01 -05:00
Drake Arconis
425db80fea
Fix warning on non-windows platforms about unknown pragma
2013-03-04 03:31:44 -05:00
Drake Arconis
43c0c4ce91
Some CMake Cleanup
...
Clean up leftover SERVER and VIEWER from when they were a single tree
Fixed debian multiarch cmake
Small bits of OSX cleanup
2013-03-04 03:31:24 -05:00
Lirusaito
79f6883bdf
[Issue 662] Translations retouch
...
Fixes overlaps and text running out of boundaries.
2013-03-03 14:48:03 -05:00
Lirusaito
3effb23f08
Call LLTrans::parseStrings before setting up notifications during LLAppViewer::init
...
Fixes the issue with notifications not translating
Moves the UI initialization code block up a few lines to the same area as v-d and sunshine-external have it.
This more clearly shows how it relates with upstream code such that future changes in this area might avoid similar issues.
2013-03-03 11:42:38 -05:00
Lirusaito
9ffa700c97
xmllint fixups
2013-03-03 09:58:02 -05:00
Lirusaito
198ef8feb0
Fix French role_actions.xml parsing warning
2013-03-02 22:20:42 -05:00
Lirusaito
fcd343af69
Small touches
...
Missed a line during Issue 662
Correct order of contributors to be alphabetical
Present existing translations before others.
2013-03-02 19:25:47 -05:00
Lirusaito
11856180aa
[Issue 662] Translations from upstream to ease the resulting load on translators.
2013-03-02 14:32:26 -05:00
Lirusaito
4060db34fa
[Issue 662] The text replacing certain heading texts to be as wide as it needs to be
2013-03-01 19:53:29 -05:00
Lirusaito
ab21a74bfc
[Issue 662] Plug in LLPanelEstateInfo::updateEstate* functions
2013-03-01 19:31:18 -05:00
Lirusaito
bbe81a86f5
[Issue 662] Allow Version text on Region/Estate region tab to be as long as it needs to be
2013-03-01 15:36:24 -05:00
Lirusaito
1c0f222028
[Issue 662] Add Environment tab to Region/Estate Floater.
2013-03-01 15:23:44 -05:00
Lirusaito
cfd24e0f09
[Issue 662] Switch to using LLEstateInfoModel
...
Applies part of STORM-1506 patch from https://codereview.secondlife.com/r/397/
Removes old WindLight parts from code.
2013-03-01 11:23:43 -05:00
Lirusaito
c2c9d53000
[Issue 662] In preparation for Environment panel, sync panel_region_estate.xml
2013-02-28 23:38:49 -05:00
Lirusaito
8eff717612
[Issue 662] STORM-1265: Combine Terrain and Ground Textures tabs in Region/Estate floater
2013-02-28 23:37:23 -05:00
Lirusaito
c509378b24
[Issue 662] Make the Region/Estate's Covenant panel's text editor take up as much space as the LL Viewer's.
2013-02-28 19:44:29 -05:00
Lirusaito
df8595b72e
[Issue 662] Update llfloaterregioninfo.* in preparation for adding new functionality.
2013-02-28 15:04:05 -05:00
Lirusaito
6525ccc384
Group Feature Request/Bug Fix: Allow setting a log location for any account before log in
...
The new setting gets overridden by the per account setting, if it has been set, but provides users the ability to set log location pre-login.
2013-02-28 14:41:08 -05:00
Lirusaito
7617f560ab
Fix up a mistake in antispam logic where only the user, not any other residents might be blocked.
...
Adds can_block() to NACLantispam.cpp to unify the blocking checks, so mistakes like this shouldn't happen again.
Best viewed without space changes.
2013-02-28 14:05:01 -05:00
Lirusaito
4990af9cfd
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon
2013-02-27 15:47:03 -05:00
Lirusaito
09c8be1673
Workaround the chat bar no longer focusing because it is within a layout_stack
2013-02-27 15:35:38 -05:00
Aleric Inglewood
186c3ef88a
Add support for xdg-open.
2013-02-27 17:22:10 +01:00
Latif Khalifa
ad03c27805
Tell cmake to only search paths we tell it to
2013-02-27 00:49:51 +01:00
Siana Gearz
c9ab38d449
Stream frequency change support and new anti-starvation strategy
2013-02-26 23:13:39 +01:00
Lirusaito
cef61db77f
Feature Request: Add debug setting for showing Position Before Parcel in the Status Bar
...
Adds StatusBarPositionBeforeParcel
Enables builders on parcels with keywords in their names to see their position.
2013-02-26 16:59:35 -05:00
Lirusaito
c0c32c4b70
Minimal update of llpanelgrouproles.cpp to get the owner role checkbox to enable properly.
2013-02-26 16:56:59 -05:00
Lirusaito
620849607e
Fulfill feature request: Optionally, don't ShowDisplayNameChanges in notifications.
...
Show display name changes checkbox added to Adv. Chat->Chat/IM tab.
Better viewed without space changes.
2013-02-26 16:35:02 -05:00
Lirusaito
180d1862a8
Dim seconds text in general preferences when AllowIdleAFK is false.
2013-02-26 16:07:21 -05:00
Siana Gearz
6ee8cc5798
Unbreak skinning on low end hardware
2013-02-26 20:47:43 +01:00
Siana Gearz
f3b7102034
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-02-26 00:23:35 +01:00
Siana Gearz
13e0bc2742
Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/lldrawable.cpp
indra/newview/llviewerwindow.cpp
2013-02-26 00:20:26 +01:00
Siana Gearz
a4b49e3fc2
Random stab at object updates. Tell me if it breaks anything.
2013-02-26 00:00:45 +01:00
Siana Gearz
e2659b801a
Dirty fix object import
2013-02-25 23:58:43 +01:00
Lirusaito
c3e63e7ab7
handleLocalChatBar visibility whenever ShowLocalChatFloaterBar changes value
2013-02-25 17:39:53 -05:00
Shyotl
d27b329afb
Minor bit of cleanup. Also now using glTexGenf instead of glTexGeni for fixed-function water texcoords.
2013-02-25 13:02:22 -06:00
Shyotl
e187e642c0
Restored some RLVa shownames logic that was clobbered a while ago.
2013-02-25 13:00:07 -06:00
Shyotl
fd21197d2a
Wedged high-res non-tiled deferred snapshot logic into LLViewerWindow::rawRawSnapshot
2013-02-25 12:59:17 -06:00
Shyotl
34cf0329ab
Crahfix for avatars, as destruction can be delayed via llpointer refs, meaning the region the av was in could be long gone before the avs destructor is actually called. Calling logPendingPhases in a more reasonable place (markDead).
2013-02-25 12:55:50 -06:00
Shyotl
94a0040ddb
Sunshine catchup.
2013-02-25 12:53:18 -06:00
Lirusaito
9d6d8da54d
Missed a spot in last commit.
2013-02-24 16:50:11 -05:00
Lirusaito
8e08e98c61
Only don't ShowLocalChatFloaterBar when Local Chat is torn-off. (Setting no longer requires relog)
2013-02-24 15:23:52 -05:00
Melanie
3036f74b69
Send the currently selected object list in the custom menu options request so that options can be created that operate on items.
2013-02-24 11:03:14 -05:00
Lirusaito
2ad9476961
Support SimulatorFeature MarketplaceURL for Marketplace Search tab on non-SL grids.
2013-02-24 10:54:46 -05:00
Aleric Inglewood
13e032fb04
Make AICurlThread::wakeup_thread thread-safe.
2013-02-23 23:29:43 +01:00
Aleric Inglewood
803e92020b
Renamed AICurlThread::mWakeUpMutex --> AICurlThread::mWakeUpFlagMutex
2013-02-23 23:23:48 +01:00
Aleric Inglewood
b6cbed838f
Assertion bug fix for libcwd with dc::curl on and curlio off.
2013-02-23 21:37:07 +01:00
Aleric Inglewood
19314b6686
Removed two unnecessary states from AICurlEasyRequestStateMachine
...
Removed AICurlEasyRequestStateMachine_added and
AICurlEasyRequestStateMachine_finished because the state machine is not
taking any action there anyway, and those states might be skipped all
together even, so they make no sense / shouldn't exist.
2013-02-23 21:33:37 +01:00
Aleric Inglewood
5d329d9e55
Fix initialization list order.
...
Also fixes a Dout line and initializes mState to 0 so
that if ever set_state would be called first from
a non-main thread then it will be larger (probably
not needed currently).
2013-02-23 21:13:26 +01:00
Aleric Inglewood
4851cc174e
Revert "Work in progress"
...
This reverts commit ef35aa7954
because it contained too much wrong things that I won't be
using. I'll re-commit stuff from it after that that I do
want to keep.
2013-02-23 20:00:13 +01:00
Aleric Inglewood
78bb94eb42
Bug fix: remove remainder of test code
2013-02-23 19:36:18 +01:00
Lirusaito
c6aa1bb3ea
French network preferences update
2013-02-21 04:42:27 -05:00
Lirusaito
489f17b6b2
Fix compile warning 'unused variable'
2013-02-21 02:18:45 -05:00
Latif Khalifa
b2b24cee7a
Compile fix
2013-02-21 01:11:03 +01:00
Aleric Inglewood
ef35aa7954
Work in progress
...
This work extends AIStateMachine to run multiplex() in the thread
that calls run(), cont() or set_state(). Note that all three
eventually call locked_cont(), so thats where multiplex() is called
from. Calling multiplex() means "running the state machine", as in
"calling multiplex_impl".
Currently only LLURLRequest uses this feature, and then only
for the HTTPGetResponder, and well only for the initializing,
start up and normal finish states.
A current/remaining problem is that we run into a situation where
the curl thread runs a statemachine to it's finish and kills it,
while the main thread is also 'running' it and tries to call
multiplex while the statemachine isn't running anymore.
2013-02-20 23:29:38 +01:00
Siana Gearz
8f5c58ff3c
Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer
2013-02-20 21:21:15 +01:00
Siana Gearz
408811c319
Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
2013-02-20 21:20:22 +01:00
Siana Gearz
1555d70230
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-02-20 21:19:39 +01:00
Lirusaito
b9da20f0d6
Added new controls to Network Preferences
...
Adds Texture Bandwidth slider
Adds Use HTTP for Inventory and Textures checkboxes.
Also, swaps out the bandwidth slider for a new Z Offset slider on quick settings, as bandwidth sliders should be set and forget, there is no modern need for them to be changed so frequently.
[Note to translators: please examine the network preferences after this update, controls have been moved and may now overlap.]
2013-02-20 06:16:53 -05:00
Shyotl
041481db89
Snap grid was pulling colors from wrong control group.
2013-02-19 22:33:31 -06:00
Shyotl
beeef8d5b9
Fix crash if periodic av metric update happens after disconnect.
2013-02-19 21:54:35 -06:00
Shyotl
8d09539fcc
Added a couple missing entries to settings.xml
2013-02-19 21:52:13 -06:00
Shyotl
07bc115b1c
Stars had nonsensical and broken face winding.
2013-02-19 20:58:13 -06:00
Siana Gearz
00cb7a0e51
Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
2013-02-19 21:12:14 +01:00
Siana Gearz
657484fedc
Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer
2013-02-19 21:10:40 +01:00
Siana Gearz
3b86a39293
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-02-19 21:10:06 +01:00
Lirusaito
49eb78db27
Added the ever-requested marketplace tab to search floater (When on SL Grids, only)
2013-02-19 08:40:12 -05:00
Shyotl
dbf646f266
More verbose fmodex llinfos output upon init. (will be useful when I add more output options.. if we keep fmodex)
2013-02-19 01:52:29 -06:00
Shyotl
76f3dc9e19
Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback.
2013-02-19 01:50:46 -06:00
Melanie
994dfc5b29
Simplify the previous commit because commit callback for buttons is now
...
identical to the clicked callback, obviating the need to distinguish between
these control types.
2013-02-18 23:21:00 -05:00
Melanie
2b9c0e34c7
Fix the Octopus to not segfault anymore
2013-02-18 21:54:16 -05:00
Lirusaito
4c33328906
If RLVa is off, RLVa z offset should not be enforced.
...
Easier diff view without space changes.
2013-02-18 17:57:40 -05:00
Aleric Inglewood
ff3910a705
Merge remote-tracking branch 'singu/master'
2013-02-18 15:38:58 +01:00
Lirusaito
e01dd3292f
Add Script Info menu entry to the self pie menu...
...
From the comments in llfloaterscriptlimits.cpp, it seems like this was intended to be a feature.
2013-02-17 23:19:23 -05:00
Lirusaito
833a6e8acf
Fix up merge of llviewermessage.cpp between Shyotl/sunshine and Canon.
2013-02-17 21:00:51 -05:00
Lirusaito
3c544bceb3
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon
2013-02-17 19:47:48 -05:00
Lirusaito
036328c3ac
Allow finding objects by typing on the script info scrolllists
...
Also tweaks columns widths and sort order to present information more effectively.
2013-02-17 19:41:59 -05:00
Aleric Inglewood
14a2788ac4
Don't even crop in rawRawSnapshot.
...
This causes LLSnapshotLivePreview::getAspectSizeProblem to never return
CANNOT_CROP_HORIZONTALLY or CANNOT_CROP_VERTICALLY anymore, making
the chance to successfully upload or save to a different target larger.
2013-02-17 22:31:32 +01:00
Siana Gearz
6123c9b80a
Enable broadcast viewer effects by default
2013-02-17 16:00:59 +01:00
Siana Gearz
dbdd0ec4f1
Merge branch 'Canon' of git://github.com/Lirusaito/SingularityViewer
2013-02-17 15:40:27 +01:00
Siana Gearz
0f54a2777e
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2013-02-17 15:36:59 +01:00
Siana Gearz
49c872c86d
Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer
2013-02-17 15:28:48 +01:00
Siana Gearz
6bf661e079
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-02-17 15:27:28 +01:00
Siana Gearz
ef4c7d9433
Some transform update fixes.
...
Thanks to MartinRJ and Henri for updateXform poking.
2013-02-17 15:23:25 +01:00
Shyotl
c3c34deb10
Added reload option to attachment 'tool' pie submenu.
2013-02-17 02:55:05 -06:00
Shyotl
4cc35d6c66
Fixed up some silly issues with the client tag system.
2013-02-17 02:54:30 -06:00
Latif Khalifa
e83befcb6b
Updated 32 bit Linux prebuilt of PCRE based on NickyP's work in Kokua. Includes unicode support.
2013-02-16 02:19:57 +01:00
Latif Khalifa
bb527b6ed1
Updated 64 bit Linux prebuilt of PCRE based on NickyP's work in Kokua. Hopefully fixes startup crash on some distros
2013-02-16 01:03:43 +01:00
Lirusaito
cd6bda876d
Add RememberName setting to settings.xml (No wonder it wasn't saving!)
2013-02-15 08:28:54 -05:00
Shyotl
51cbb8d6bd
Catch up with LL regarding viewer stat recording.
2013-02-14 17:45:10 -06:00
Lirusaito
8cc601c3e2
Fix ups for the Permissions Panel
...
Minor update and cleanup to llpanelpermissions.cpp
Hide the You can modify this object text properly when Debugging Permissions
Show Debug Permissions on the same line on the build panel.
2013-02-14 15:48:00 -05:00
Aleric Inglewood
dc3f33717c
Fixed assertion in HTTPTimeout::lowspeed
...
mTotalBytes had the meaning of "the sum of all elements in the vector",
but was reset to 0 at the start of a transaction. The meaning is now
changed to "total number of bytes in the vector that belong to the
current transaction".
2013-02-14 00:09:42 +01:00
Shyotl
2f5ab6f8e8
Once more, with feeling. (currency transaction messages)
2013-02-13 16:31:16 -06:00
Lirusaito
7a319d26d5
Extend support for custom menus by accepting messages issued by the server without question
2013-02-13 16:51:42 -05:00
Lirusaito
5d3341bc00
Correctly position custom dropdown menus
2013-02-13 14:17:34 -05:00
Lirusaito
7ca767275f
Add support for CustomMenuAction Capability
2013-02-13 13:00:40 -05:00
Aleric Inglewood
86a0536131
Compile error fix: __value is reserved on Windows.
2013-02-13 17:20:41 +01:00
Lirusaito
4d3fb7affe
Support SimulatorFeature god_names, used for identifying those the Sim reveals to be gods.
2013-02-13 03:11:20 -05:00
Lirusaito
c7fcaa8e5b
Add setFeaturesReceivedCallback for when SimulatorFeatures cap is received
2013-02-13 03:04:29 -05:00
Shyotl
8ec5915b7c
Removed some logic in llfloateravatarlist that shouldn't have been there.
2013-02-12 20:49:39 -06:00
Shyotl
a31ba15dbc
Updated LLFloaterBuyContents
2013-02-12 20:49:17 -06:00
Shyotl
f147a734b1
LLStat dead code removal
2013-02-12 20:47:55 -06:00
Lirusaito
43bb5d6e39
Add bool LLMuteList::isLinden(const LLUUID& id) for use in situations where the available name may be just display name, but there is a UUID available instead.
2013-02-12 20:43:10 -05:00
Aleric Inglewood
c6c343a45b
Compile bug fixes when -DDEBUG_CURLIO
2013-02-12 23:44:55 +01:00
Aleric Inglewood
b40e8fb508
Add checkbox "Keep aspect ratio" to snapshot floater.
2013-02-12 22:21:39 +01:00
Shyotl
6725c17f01
LLSys merge and cleanup.
2013-02-12 15:10:15 -06:00
Shyotl
24efffc68a
LLInitParam merge.
2013-02-12 15:08:11 -06:00
Shyotl
c92c68dee2
A few more preview-related changes.
2013-02-12 15:07:07 -06:00
Shyotl
1eb142535c
Merge in changes to avoid a few potential problems with LLUUID when accessed from multiple threads.
2013-02-12 15:02:17 -06:00
Shyotl
b901e57c55
Start culling of llmemtype (for now just #ifdef'd to nothingness.
2013-02-12 15:00:50 -06:00
Shyotl
0742610674
Updated gObjectPreviewProgram shader (simple lighting)
2013-02-12 14:59:02 -06:00
Shyotl
655c9348de
Minor adjsutment to llcontrolgroup. Demote non-critical failure from llerrs to llwarns.
2013-02-12 14:53:56 -06:00
Shyotl
0a8147a9da
Merged some alignment adjustments from sunshine-external
2013-02-12 14:52:53 -06:00
Shyotl
5180fbfc23
Clean up llfloaterurlentry
2013-02-12 14:50:29 -06:00
Shyotl
0759f2dae8
Actually use the namecache callback results when displaying currency transaction notifications.
2013-02-12 14:47:59 -06:00
Shyotl
c799f9f7eb
Avoid sculpt discard-level 5 spam.
2013-02-12 14:46:31 -06:00
Latif Khalifa
69c43947ed
Don't include warnings of singleton access from initSingleton() to the end users (release build)
2013-02-12 03:30:13 +01:00
Lirusaito
f95830fe23
Extend fuctionality of non-SL capability
2013-02-11 19:12:17 -05:00
Lirusaito
491af1cbf0
Remove gAllowIdleAFK (makes the general preferences checkbox functional)
2013-02-11 15:01:18 -05:00
Aleric Inglewood
b1892eb238
DoutEntering was hiding variable 'on'
2013-02-11 20:08:58 +01:00
Lirusaito
2d0e3daef3
When we don't have a parcel selected (About Land is closed), allow Script Limits refreshes to use our current parcel instead.
2013-02-11 03:55:58 -05:00
Lirusaito
8a76b5d1d2
Silly fox missed a spot!
2013-02-11 02:15:00 -05:00
Lirusaito
88ce171f1e
Initial Portuguese translation, contributed by Knolan Falconer
2013-02-11 01:19:36 -05:00
Lirusaito
1d4858ae85
Add support for two non-SL grid features/flags.
...
Adds support for GamingData cap, and flags: PF_GAMING, DFQ_FILTER_GAMING, REGION_FLAGS_GAMING, and REGION_FLAGS_HIDE_FROM_SEARCH
Adds GamingCheck to floater_about_land.xml
Adds filter_gaming checkboxes to floater_directory* xmls
Adds "is gaming" and "hide from search" checkboxes to floater_god_tools.xml
2013-02-11 01:14:09 -05:00
Lirusaito
cff7a2a464
Brought in Script Limits from v-d! (Accessible from About Land)
2013-02-11 01:12:21 -05:00
Aleric Inglewood
c18b156d8b
Bug fix for scrolling folder views.
...
An LLFolderView is added as child to LLScrollableContainerView,
but also adds the LLScrollableContainerView to it's mScrollContainer.
As a result, when scrolling inside a LLFolderView the event is passed to
the mScrollContainer, which then passes it first on to it's children
(see the "Bad UI design" remark in the code), causing an infinite loop.
This patch breaks that loop for those objects that have a
mScrollContainer: LLFolderView and LLContainerView.
2013-02-11 03:36:46 +01:00
Aleric Inglewood
2a177c6614
Fix for libcwd configured with --disable-location
2013-02-10 18:18:50 +01:00
Lirusaito
085d6cc806
Derive LLPanelPlace from LLRemoteParcelInfoObserver, and update affected sections to v-d.
2013-02-09 17:06:38 -05:00
Lirusaito
818734878d
Update LLFloaterLand to v-d
2013-02-09 16:17:29 -05:00
Aleric Inglewood
2d7ab61c6e
Make keyboard focus more robust under closed floaters.
2013-02-08 18:40:14 +01:00
Aleric Inglewood
dd6f95cd33
Make AIList resilient against invalidating iterators.
...
This adds a counter and a 'dead' flag to the data stored in the linked
list. The counter counts the number of iterators (still) pointing to an
element and the dead flag is set to indicate the element was erased when
iterators are still pointing to it. As a result, iterators are NEVER
invalidated. Of course, such elements are subsequentially skipped when
iterating over the list. Assertions protect against dereferencing an
erased iterator, but incrementing or decremention still works: it is
still well-defined what the next (non erased) element is, assuming the
element wasn't erased (yet), but would be erased delayed - or assuming
the iterator would have been incremented (decremented) in advance to
erasing the element.
2013-02-08 17:28:22 +01:00
Aleric Inglewood
d5482e6c74
Do not pre- increment the loop iterator in LLView::drawChildren
...
This is in fact much safer, because the only way to invalidate an
interator in the first place (in this code) is by calling removeChild,
which *already* has an assert never to remove a child that is being
iterated over (by means of the mInDraw flag).
2013-02-08 17:28:21 +01:00
Aleric Inglewood
baab1d81a7
Wrap LLView::child_list_t in a class AIList.
...
So far not doing anything. Iterators already keep a pointer to the
container they belong to.
2013-02-08 17:28:21 +01:00
Aleric Inglewood
ea114986be
Use viewList_t and child_list_t in appropriate places.
...
Both types are currently the same, but soon they will be made different.
Currently they are used a bit mixed up. This patch fixes that.
2013-02-08 17:28:21 +01:00
Aleric Inglewood
c1e6812f41
Remove unused variable.
2013-02-08 17:28:21 +01:00
Aleric Inglewood
e7aeb3feaf
Add AINRLock for debugging purposes.
...
This class can be used as RWLOCK parameter to AIThreadSafe to check that
data is only accessed by a single thread (like
AIThreadSafeSingleThreaded) AND is never write locked when a read or
write lock was already obtained (by the same thread). It doesn't
actually lock anything, it just keeps track if the "lock" was obtained
before. The use case is to check if STL containers aren't being used
(read or write locked) by a calling function when additional write
access is necessary, as write access might invalidate iterator that
point to the container (where the previous lock was taken).
2013-02-08 17:28:21 +01:00
Aleric Inglewood
adf4c9a0ce
Make the type of the read/write lock of AIThreadSafe a template parameter.
...
This allows passing a different type than the default AIRWLock for
debugging purposes.
The signature of the class used for RWLOCK should be:
struct RWLock {
// Default constructor.
RWLock(void);
// Block until it's safe to read the data.
// high_priority is a hint that granting this thread the read lock is more important than granting another thread a write lock.
void rdlock(bool high_priority = false);
// Release the obtained read lock.
void rdunlock();
// Block until it's safe to write to the data.
void wrlock();
// Release the obtained write lock.
void wrunlock();
// Convert the obtained write lock into a read lock.
void wr2rdlock();
// Block until it is possible to convert the obtained read lock into a write lock.
void rd2wrlock();
// Return true when a read or write is obtained and subsequent calls to release the lock are expected.
bool isLocked() const;
};
2013-02-08 17:28:21 +01:00
Aleric Inglewood
38d1525092
Merge remote-tracking branch 'singu/master'
2013-02-08 17:26:14 +01:00
Latif Khalifa
56b2c10312
Renamed deferred rendering switch from 'Lightning and Shadows' to 'Advanced Lighting Model' as per upstream
2013-02-07 18:17:15 +01:00
Aleric Inglewood
db5846c145
Added documentation on LLHTTPClient Responders.
2013-02-07 17:43:40 +01:00
Lirusaito
73dab7e00b
Fix Sappa's issue with getString log spam, three strings weren't quite in the right xml.
2013-02-06 22:55:19 -05:00
Lirusaito
54c1fcf33d
Override the viewer's Z offset with the RLV one, if the RLV one has been set.
2013-02-06 22:41:10 -05:00
Lirusaito
604acd8939
Fix Issue 628: Currency exchanges no longer notify in chat
2013-02-06 16:44:08 -05:00
Lirusaito
3d9c287410
Minor french translation update, thanks Nomade~
2013-02-06 00:27:22 -05:00
Latif Khalifa
78dbaf2ed1
Moved RLVa menu back to advanced by default
2013-02-04 00:47:19 +01:00
Siana Gearz
7852da1506
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-02-04 00:21:07 +01:00
Latif Khalifa
e7a2f171d9
Merge remote-tracking branch 'upstream/master'
2013-02-03 23:48:05 +01:00
Siana Gearz
dc3f91b121
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-02-03 22:27:53 +01:00
Siana Gearz
064601ae5e
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-02-03 22:18:44 +01:00
Siana Gearz
2b036c7334
Split out HTTP texture bandwidth
2013-02-03 22:18:34 +01:00
Siana Gearz
6a774e4685
This should fix voice decline crash
2013-02-03 21:56:13 +01:00
Aleric Inglewood
83fb898852
Bug fix: Wake up curl thread at exit of viewer.
2013-02-03 17:24:26 +01:00
Latif Khalifa
4317fc36a8
Merge remote-tracking branch 'shyotl/sunshine'
2013-02-02 02:56:23 +01:00
Siana Gearz
57d43786ab
Merge branch 'sunshine' of https://github.com/Shyotl/SingularityViewer
2013-02-02 02:22:46 +01:00
Shyotl
1069d5dec4
Draw trees before sky. Z-cull may be beneficial. Also, was incorrectly setting alphawrite off for deferred wlsky pass.
2013-02-01 17:16:01 -06:00
Aleric Inglewood
d055494706
Libcwd compile fixes
...
include linden_common.h first (is already included through the used
headers).
2013-02-01 21:26:08 +01:00
Lirusaito
0a6bebf9db
Added ShowSimChannel debug setting to display sim channel information in the status bar.
2013-01-31 22:22:40 -05:00
Lirusaito
5b2e1a0aae
Remove remaining dead LCD code(, also fix typo in a comment)
2013-01-31 21:32:29 -05:00
Lirusaito
46ddc9b6be
Skins Request: Nano Green and Nano Purple
2013-01-31 21:18:50 -05:00
Latif Khalifa
5cbe633117
Fixed compile under older GCCs by Siana Gearz
2013-02-01 00:18:01 +01:00
Latif Khalifa
719ea47a35
Merge remote-tracking branch 'lirusato/Canon'
2013-01-31 17:21:08 +01:00
Latif Khalifa
70eeddabba
Merge remote-tracking branch 'shyotl/sunshine'
2013-01-31 17:20:58 +01:00
Lirusaito
d756225684
Minimal change to fix folder->Add Items, purgeCategory wasn't supposed to be called in this case.
2013-01-31 02:41:17 -05:00
Shyotl
26de17f2de
Avoid occasional DoF-related crash upon region disconnection.
2013-01-30 22:04:57 -06:00
Shyotl
be0d751334
Cleanup, further hardening of namecache callbacks, and update to avatar picker.
2013-01-30 22:04:04 -06:00
Latif Khalifa
4b0bac34dd
Added the ability to have the voice enabled in multiple viewer instances
2013-01-31 01:26:39 +01:00
Lirusaito
bf8bd9cb1a
Further notifications.xml touchup.
2013-01-30 19:16:56 -05:00
Lirusaito
e009b8f4b4
Added simple codeless floaters for My Outfits and Favorites folders, entries are in World menu.
2013-01-30 14:11:22 -05:00
Lirusaito
47cbaeed23
XML-Driven floater feature (and documentation)
...
Changes:
Adds LLUICtrlFactory::getBuiltFloater() to return LLFloater* when a floater has been built.
In llviewermenu.cpp's LLShowFloater::handleEvent():
Return early if the floater_name is empty,
otherwise if no anticipated floater is found, build one,
unless one of the same name is already built, then bring it to focus.
Documentation:
In order to add simple codeless floaters, a general understanding of our XMLs is necessary...
A simple codeless floater can be a few things, perhaps not limited to: media browsers, settings controls, and holders for inventory_panels.
So how do you make them conform to the codeless standard?
For the purpose of these examples, my floater file will always be floater_name.xml
Let's start with a shortened xml menu entry:
<menu_item_call label="Name!" name="name">
<on_click function="ShowFloater" userdata="floater_name.xml"/>
</menu_item_call>
Alright, that wasn't so hard, just remember the key in this is ShowFloater is the function and userdata is the filename.
The next part is the actual floater, which isn't so different from making a complex floater..
There are two ways to do this, depending upon desired behavior:
The first behavior is to have only one of the floater open at a time, the following short xml exemplifies this:
<floater name="floater_name.xml" title="Name!"/>
Having a floater with this behavior will cause the menu entry to bring it into focus.
The other behavior is to allow more than one of the floater open at a time:
<floater name="name" title="Name!"/>
In this case, the menu entry will spawn a new version of the floater with every click, regardless of previous ones existing.
Granted, these short <floater/>'s probably aren't but examples and will not likely stand alone.
2013-01-30 14:07:59 -05:00
Latif Khalifa
4e29b6752e
Fixed packaging of the mac build
2013-01-30 14:17:16 +01:00
Latif Khalifa
046735f043
Merge remote-tracking branch 'upstream/exp'
2013-01-30 05:49:45 +01:00
Latif Khalifa
a9b05fd029
Merge remote-tracking branch 'lirusato/master'
2013-01-30 05:48:45 +01:00
Latif Khalifa
5c8e436401
Fix windows build: warnings management
2013-01-30 05:45:00 +01:00
Latif Khalifa
4d805da6ac
Package glod and colladadom dlls
2013-01-30 05:43:17 +01:00
Latif Khalifa
085800f6e0
Tell the compiler we are using colladadom dll, and not a static lib. Use our current boost libs
2013-01-30 05:27:10 +01:00
Latif Khalifa
1934fc9bd4
Temporarily disable HACD file save functions (not used) to avoid strange linking issue on windows
2013-01-30 05:25:05 +01:00
Latif Khalifa
8c1848b487
Silence secure CRT warnings when building HACD
2013-01-30 05:14:48 +01:00
Latif Khalifa
8edb10fb88
Merge remote-tracking branch 'aleric/meshupload' into meshupload
2013-01-30 05:12:04 +01:00
Aleric Inglewood
8aecc49456
Add missing notifications.
2013-01-30 03:58:42 +01:00
Latif Khalifa
b8919c21d8
Merge remote-tracking branch 'aleric/meshupload' into meshupload
2013-01-30 03:46:45 +01:00
Aleric Inglewood
9203b24eb9
Remove AIStateMachineThreadBase* argument from AIThreadImpl constructor.
...
Also removes the use of 'this' to initialize base classes, which led to
a compiler warning on vs2010.
2013-01-30 03:44:02 +01:00
Latif Khalifa
8584e6da4c
Merge branch 'master' into meshupload
...
Conflicts:
indra/llcommon/llhash.h
indra/newview/CMakeLists.txt
indra/newview/llfloatermodelpreview.cpp
indra/newview/llfloatermodelpreview.h
indra/newview/llpanelprofile.h
2013-01-30 00:36:31 +01:00
Aleric Inglewood
1d673df1bd
Add AIMeshUpload and fix LLMeshUploadThread
...
* Removes polling stuff (call to gMeshRepo.update()) which did
nothing but check if uploads already finished.
* Just creates and runs the state machine (AIMeshUpload) instead
of creating an LLThread derived class (LLMeshUploadThread) and
adding that to a queue, then have the main thread start it
after adding it to another queue in order to keep track of
the instances (both queues are gone).
* mWholeModelUploadURL was moved to the state machine, because
it needs a life time till the responders finishes (can't be
part of the thread object).
* LLMeshUploadThread is now derived from AIThreadImpl instead
of LLThread, so it can be run in a state machine thread.
* The call to LLHTTPClient::post is now done from the main
thread instead of from the thread, but I don't think that is
a problem.
2013-01-29 23:42:06 +01:00
Aleric Inglewood
b3adf71ed7
Remember floater rectangle
2013-01-29 23:20:02 +01:00
Aleric Inglewood
7ba0b6482c
Fix example code.
2013-01-29 20:49:53 +01:00
Aleric Inglewood
e99175444f
Bike fix: Always set mStatus to STOPPED
2013-01-29 20:45:08 +01:00
Aleric Inglewood
d5ed31ca9b
Allow passing a name to underlaying LLThread in debug mode.
2013-01-29 20:44:14 +01:00
Aleric Inglewood
1c8027b1e6
Add statemachine parent callback support to LLHTTPClient::post
2013-01-27 22:02:19 +01:00
Aleric Inglewood
ebac80b5b7
Fix termination race condition.
2013-01-27 20:52:21 +01:00
Siana Gearz
4cab6a89a9
1024-sized terrain texture support
2013-01-27 06:06:13 +01:00
Siana Gearz
50a360d314
Silence voice complaint about missing cap
2013-01-27 04:42:00 +01:00
Lirusaito
4e96dccd7c
Fix Issue 385: Group chat announces in window not in Instant message
...
Improved Ignore Group functions
Best viewed without space changes.
2013-01-26 21:47:32 -05:00
Siana Gearz
7755033017
Lazily fix static deinitialization fiasco
2013-01-27 01:43:38 +01:00
Siana Gearz
aed472af77
Try to fix long-standing crash-on-resize in Linux.
...
It appear's SDL's SetVideoMode can cause repeat SDL_VIDEORESIZE message and shouldn't be called again.
2013-01-27 01:41:17 +01:00
Aleric Inglewood
c528a15e95
Added AIStateMachineThread
2013-01-26 19:19:09 +01:00
Aleric Inglewood
6dc4a60724
Changes to LLThread
...
* Call a virtual terminated() that by default sets mStatus to STOPPED,
instead of setting it to STOPPED directly, allowing to override
the behavior of a LLThread derived class when the thread is about
the exit.
* Make setQuitting() public, so it can also be used to hint to a
thread that it should stop at its earliest convience.
2013-01-26 19:15:57 +01:00
Aleric Inglewood
f6785c399d
Added support for LLCondition to AIThreadSafeSimple.
2013-01-26 18:35:42 +01:00
Latif Khalifa
237f84cde0
Merge remote-tracking branch 'shyotl/sunshine'
2013-01-26 13:49:50 +01:00
Shyotl
485ad8e645
Reworked name loading for vivox speaker list. LLSpeaker now boost::signals2::trackable to avoid accessing after destruction. Opening new sessions via doubleclick on list(sessions managed by legacyname) or using the mute button(legacyname needed to exclude lindens) are both disabled until namecache lookup complete.
2013-01-26 01:57:13 -06:00
Lirusaito
1582bf43c5
Allow RLVa Z Offset and Vanity Body Dynamics Offset to coexist.
2013-01-25 11:26:52 -05:00
Aleric Inglewood
a1fa43850b
Comment fixes.
2013-01-25 16:09:34 +01:00
Latif Khalifa
5e799b1f81
Respect always rez under owned land group setting for objects
...
duplicated by shift-dragging or duplicating.
Based on Phoenix changeset 5b50018c63d4 by Kadah
2013-01-23 12:02:04 +01:00
Siana Gearz
5bc8102864
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-23 00:08:38 +01:00
Aleric Inglewood
0296812e88
Add cmake file for collada and glod.
...
This fixes standalone when those libraries are installed
elsewhere. Note that it "breaks" standalone if you just
installed the prebuilt manually. For that to work you
have to add /.../libraries/include to CMAKE_INCLUDE_PATH,
which is not recommended because it would pick up any
other prebuilt over your system installed libraries.
Instead, for standalone, install the libraries somewhere
with some prefix and then add that prefix to the environment
variable CMAKE_PREFIX_PATH.
For example, $prefix/include/collada and $prefix/lib/libcollada4dom.so
2013-01-22 20:51:43 +01:00
Latif Khalifa
d8c846288e
Merge remote-tracking branch 'lirusato/master'
2013-01-22 20:06:03 +01:00
Lirusaito
dd1e9a68d4
Removal of the deprecated lltabcontainervertical.
2013-01-22 01:38:25 -05:00
Lirusaito
36e6946c96
AuroraSim: More tiny bits to help life be normal on the grid.
2013-01-21 21:32:37 -05:00
Lirusaito
fa8e1f033b
AuroraSim: non-power-of-two support.
2013-01-21 21:32:06 -05:00
Lirusaito
415bcd2b6c
Merge branch 'master' into VarRegion
2013-01-21 21:31:34 -05:00
Lirusaito
21860ded90
Support web_profile_url response from OSGrid servers for setting WebProfileURL
2013-01-21 21:27:53 -05:00
Lirusaito
48113f8506
AuroraSim: HippoLimits and HippoGridManager update, and support for Aurora's MaxDrag
2013-01-21 21:22:04 -05:00
Aleric Inglewood
db7155666d
Merge branch 'master' into meshupload
...
Conflicts:
indra/cmake/00-Common.cmake
One diff added /MP to CMAKE_CXX_FLAGS_DEBUG while
another removed /arch:SSE2 from the same line.
Fixed to honor both changes.
2013-01-21 19:16:06 +01:00
Latif Khalifa
b758014ebc
Adjust to recent change in the API for Responder objects
2013-01-21 11:25:32 +01:00
Latif Khalifa
18816ae146
Merge remote-tracking branch 'shyotl/sunshine'
2013-01-21 11:25:10 +01:00
Shyotl
dc106c5442
Fix some compiler warnings/errors. Error in llinventorymodelbackgroundfetch was introduced by partial commit.
2013-01-20 17:10:38 -06:00
Lirusaito
aa3228be76
French translation update, thanks Nomade~
2013-01-20 10:25:19 -05:00
Lirusaito
c2ce72ed94
Issue 604: Reset Button for inventory
...
Attempted Spanish translation.
Nomade Zhao provided French.
2013-01-20 10:15:23 -05:00
Siana Gearz
4cd2de0fff
Version 1.7.3
2013-01-20 05:57:05 +01:00
Siana Gearz
b318a0703b
Use standard way on windows to find default file picker path
2013-01-20 05:55:18 +01:00
Siana Gearz
ea67aca955
This should de-clog the tubes on the map
2013-01-20 03:32:51 +01:00
Siana Gearz
0ab140a071
Potential permission fix
2013-01-20 01:49:55 +01:00
Siana Gearz
d5eb2432ef
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-20 01:49:14 +01:00
Lirusaito
a6c2d256c6
Hooked up RLVaTopLevelMenu setting so it actually works.
...
Changes to llviewermenu.cpp are better viewed without space changes
^Put together both RLVa Embedded and RLVa Main menus while building Advanced menu, labeling them RLVa; once the advanced menu is built and added to MenuBar, rlvMenuToggleVisible() is called.
Added onChangedMenuLevel() to rlvcommon.cpp
Added rlvMenuToggleVisible(), tweaked to only perform necessary operations for now, other parts left commented out for future use.
Removed menu visibility handling from RlvHandler::setEnabled()
NOTE: RLVa has only been updated in pertinent areas, from what I can tell we are a bit behind in other places, too.
2013-01-18 15:14:33 -05:00
Aleric Inglewood
7a8a2757db
Add comment for sake of translation.
2013-01-18 16:10:18 +01:00
Aleric Inglewood
d8d3cafc32
Merge remote-tracking branch 'singu/master'
2013-01-18 02:28:17 +01:00
Aleric Inglewood
604824335c
Keep focus during Freeze Time so that pressing ESC always leaves Freeze Time.
2013-01-18 02:26:43 +01:00
Latif Khalifa
9240147874
Merge remote-tracking branch 'lirusato/master'
2013-01-17 17:26:00 +01:00
Lirusaito
05a6323d2c
French antispam controls touchup
2013-01-17 09:17:43 -05:00
Lirusaito
1dd0b7713b
French translation fixies~
2013-01-17 03:38:53 -05:00
Lirusaito
795f70a0b0
d520053 - MAINT-852 / VWR-8761 : Cannot delete object description. Now you can.
2013-01-17 01:11:59 -05:00
Lirusaito
5831af0fb6
OPEN-161: Typo in the header guard of lltexturecache.h
2013-01-17 01:10:47 -05:00
Aleric Inglewood
e8e3e43711
Update llqtwebkit with recompiled version.
2013-01-17 00:43:21 +01:00
Latif Khalifa
460b05d37a
Merge remote-tracking branch 'shyotl/master'
2013-01-16 16:25:51 +01:00
Latif Khalifa
f03405ca47
Merge remote-tracking branch 'lirusato/master'
2013-01-16 16:25:37 +01:00
Lirusaito
0405ed9e3d
French Translation update.
2013-01-16 09:27:25 -05:00
Lirusaito
2eb8f2f84a
07e5202 MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
2013-01-16 05:00:35 -05:00
Shyotl
6894d4c0bc
Changed how the 'client' column in avatar radar is handled. Initially was not designed nor tested to be toggleable on user-demand (was one shot deal depending on detected grid).
2013-01-15 23:14:58 -06:00
Lirusaito
53c04b7299
Issue 220: Copy/paste params in the build tools like phoenix
...
Adds mClipboardFlexiParams, mClipboardLightParams, mClipboardSculptParams, and mClipboardLightImageParams to LLPanelObject.
Corrects the tooltip on the the copy button.
2013-01-15 22:43:22 -05:00
Latif Khalifa
3bf307abb0
Merge remote-tracking branch 'shyotl/master'
2013-01-15 18:37:09 +01:00
Latif Khalifa
4928d29a8e
Merge remote-tracking branch 'aleric/master'
2013-01-15 18:36:51 +01:00
Latif Khalifa
8cec9c7b73
Merge remote-tracking branch 'lirusato/master'
2013-01-15 18:36:39 +01:00
Shyotl
a6e3352073
Setting camera toolset as current sticks us into build mode (??)... Avoid when taking snapshots.
2013-01-14 23:09:12 -06:00
Aleric Inglewood
0eeea37662
Fix 'Open floater in Freeze Time mode'
...
When the floater was opened in Freeze Time mode, then parent of the
widget that triggers it to open is the 'Floater View'. We do NOT
want to set that MouseOpaque :p. Using getParent here is just
nonsense.
2013-01-15 03:31:57 +01:00
Shyotl
2a8f55e99e
Updated gesture floater to use more modern (and actual working) method of adding list elements via xml.
2013-01-14 18:41:48 -06:00
Aleric Inglewood
db7b0c1785
Revert last part (work in progress of last two commits, I guess).
2013-01-15 00:11:17 +01:00
Aleric Inglewood
55e64f6ab0
Fix for last commit.
...
Show sculpties with no (or not enough) data as spheres with default LOD
stepping.
2013-01-14 23:53:58 +01:00
Aleric Inglewood
6fce7062e5
Fix gcc 4.4 problem.
...
When a sculptie has too few vertices, especially when we bluntly assume
it's stitched around and don't want to get less than 4 vertices in
either direction, then instead we end up with even ZERO vertices, which
causes a division by zero in LLPath::genNGon with undefined behavior.
2013-01-14 23:14:29 +01:00
Aleric Inglewood
2df8ba19f4
Fix last compiler warning.
2013-01-14 22:59:49 +01:00
Aleric Inglewood
e4a3b3b5ba
Merge remote-tracking branch 'shyotl/master'
2013-01-14 16:12:57 +01:00
Lirusaito
0494dc8d32
Fix Issue 432: Radar Keeps Popping Up and side issue I got still the window "An object owned by you ..."
...
Unified key message sending to function send_keys_message()
Switched a few getBOOLs to CachedControls
Added RadarChatKeysStopAsking, and RadarChatKeysRequest as a three button notification so the user can decide to permanently say no.
Corrected RadarChatKeys description to be more accurate.
If we want to know if the radar is open, we check instanceExists, not getInstance.
Also enabled using the announce button when RadarChatKeys is false to announce keys, for manual updates.
2013-01-14 06:34:27 -05:00
Latif Khalifa
3dd33518c4
Merge remote-tracking branch 'shyotl/master'
2013-01-14 10:53:27 +01:00
Shyotl
db8225a078
Fixup LLScrollListCtrl::setCommentText, and incorrect behaviors with script editor and bulk perm editor pertaining to setCommentText inherited from V3.
2013-01-14 03:36:04 -06:00
Siana Gearz
8bc05f6d15
Fix double upload dialog
2013-01-14 00:04:43 +01:00
Damian Zhaoying
00fb7804da
Spanish Translate for new Group/Chat/IM floaters and some general string fixed
2013-01-13 19:05:35 -03:00
Siana Gearz
3091d9c847
Potential permission fix
2013-01-13 21:50:31 +01:00
Siana Gearz
d1de4d53fe
Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshupload
2013-01-13 20:37:04 +01:00
Commander Cupcake
c08c2a55e5
Revert changes that broke bump
2013-01-13 14:30:41 -05:00
Siana Gearz
cddd21d879
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-13 20:11:15 +01:00
Siana Gearz
188e42ee4a
Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup
2013-01-13 20:10:25 +01:00
Aleric Inglewood
f606477ae5
Use "mesh" as context everywhere (for loading and saving).
2013-01-13 19:48:35 +01:00
Aleric Inglewood
5250b218c5
LLPanelProfile is not a floater: onOpen is not virtual.
2013-01-13 19:47:32 +01:00
Aleric Inglewood
909247a179
Keep decimal format the default.
2013-01-13 19:46:35 +01:00
Aleric Inglewood
e7dea2714e
Merge branch 'master' into meshupload
2013-01-13 18:02:28 +01:00
Aleric Inglewood
dcc2e52c61
Merge remote-tracking branch 'singu/master'
2013-01-13 18:01:48 +01:00
Aleric Inglewood
db17b93156
Merge branch 'master' into meshupload
...
Conflicts:
indra/newview/llmeshrepository.cpp
Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.
2013-01-13 17:59:49 +01:00
Latif Khalifa
11c5e1cf4c
Merge branch 'master' into 1.7.3-dev
2013-01-13 12:45:43 +01:00
Latif Khalifa
cef7ea9f5e
Merge remote-tracking branch 'lirusato/master' into 1.7.3-dev
2013-01-13 12:45:37 +01:00
Latif Khalifa
31d2a15957
Merge remote-tracking branch 'aleric/master' into 1.7.3-dev
2013-01-13 12:45:25 +01:00
Shyotl
e622e03d2a
Bulk of server-baking impelmentation and a bit of cleanup.
2013-01-13 02:37:12 -06:00
Siana Gearz
5b0597ea47
Suppress 400 GCC warnings in Collada DOM headers
2013-01-13 06:27:02 +01:00
Siana Gearz
5f3ca7fda0
Linux64 support, integrated physics/decomposition
2013-01-13 03:23:56 +01:00
Aleric Inglewood
3a414b21fa
Temporary workaround for release.
2013-01-13 02:18:00 +01:00
Aleric Inglewood
e99a906f54
Testsuite part 1: make it compile alone.
2013-01-13 01:58:49 +01:00
Aleric Inglewood
fc4b02cee8
Moved HTTPTimeout to it's own files.
2013-01-12 23:00:21 +01:00
Aleric Inglewood
e01567553e
Added default message for feed uploads.
...
By default show 'Type your message here...' and if the text editor
never got focus, replace that with a default message.
2013-01-12 21:31:21 +01:00
Aleric Inglewood
bf7b0bf4bf
Hide floater until success/failure (or floater is re-opened)
2013-01-12 21:16:40 +01:00
Lirusaito
ece92a1b7c
Optionally, have group chat and conference buttons on title line.
...
Adds UseConciseGroupChatButtons, and UseConciseConferenceButtons
Adds "Buttons on group chat name line (Affects new group chats)" and "Buttons on conference title line (Affects new conferences)" checkboxes to Adv. Chat's Chat UI tab.
Adds floater_instant_message_ad_hoc_concisebuttons.xml, floater_instant_message_group_concisebuttons.xml
Brings panel_speaker_controls.xml's speakers_list down by 7 pixels, which is necessary because it is awkwardly high in old places as well, such as Local Chat.
2013-01-12 14:42:55 -05:00
Aleric Inglewood
2da5c51e42
Do not freeze UI when snapshot floater is opened the first time.
2013-01-12 17:35:01 +01:00
Aleric Inglewood
57228fa208
Fix upload snapshot to inventory callback mechanism.
2013-01-12 17:27:33 +01:00
Aleric Inglewood
024c62aed4
Fix the "map/set iterators incompatible" bug.
...
cookies is only valid when AIHTTPReceivedHeaders::getValues return true.
2013-01-12 04:24:21 +01:00
Aleric Inglewood
e56f14502e
Fill fd_sets AFTER processing command queue.
2013-01-12 02:51:44 +01:00
Lirusaito
82eb1a946e
Fix group buttons in horizontal and allow the horizontal buttoned friends and groups floater to take up minimal space.
2013-01-11 19:17:06 -05:00
Siana Gearz
85855ecd85
Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshup
2013-01-12 01:12:33 +01:00
Siana Gearz
cbfd31a576
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer into meshup
2013-01-12 01:11:01 +01:00
Siana Gearz
b6f1bb570f
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-01-12 00:59:06 +01:00
Siana Gearz
896036b3c2
Removing ReSit, because it's not so very nice
2013-01-12 00:50:24 +01:00
Lirusaito
e51937cee7
Warn more clearly about LLRadioGroup::setValue being used wrong, and attempt to recover with LLUICtrl::setValue.
2013-01-11 18:21:48 -05:00
Lirusaito
a47dbf88bb
Fix Issue 590: Debug Settings parameters setting is seriously bugged
2013-01-11 15:50:47 -05:00
Aleric Inglewood
f9a868a979
Compile fix for VC++
2013-01-11 17:16:05 +01:00
Latif Khalifa
56542a02e8
Use multiple cores for compilation of the Debug build
2013-01-11 11:28:21 +01:00
Lirusaito
2dda9499fa
Unhide Client column properly on non-SL Grids.
2013-01-11 03:56:55 -05:00
Aleric Inglewood
f9738cb611
Add getName() to every non-base class Responder object.
2013-01-11 04:15:55 +01:00
Aleric Inglewood
741a160913
Fine tune of private (libcwd) assertion.
...
It turns out that it's possible to receive data before an upload
finished when the server sends HTTP_BAD_REQUEST in the middle of the
upload (this happens to me when I try to upload a 6000x6000 image to my
profile feed, with is a 44MB file). So, in that case the finished upload
detection did not fail and we shouldn't assert.
2013-01-11 01:28:46 +01:00
Aleric Inglewood
5daf817e7e
Upload larger original to profile feed.
2013-01-10 19:42:19 +01:00
Aleric Inglewood
9175bc0e16
Fixed LLUploadDialog to display it's text.
...
Also made the view rectangle have some minimal size (1/10th of the
screens width and height).
Increased the used font a bit.
Fixed removal of the dialog in the case of uploading to profile feed.
2013-01-10 18:48:02 +01:00
Lirusaito
b7f1fdd9cc
Vertical space recovered
2013-01-09 11:25:46 -05:00
Lirusaito
07f88d21bd
Applied STORM-1209 and added string AGroupMemberNamed for translation.
2013-01-09 11:05:37 -05:00
Lirusaito
a7d1a4611f
Optionally, have IM buttons on the same line as the person's name.
...
Adds UseConciseIMButtons.
Adds floater_instant_message_concisebuttons.xml
Adds Have buttons on the same line as name for IMs (Affects new IMs) checkbox to Adv. Chat's Chat UI tab.
2013-01-09 10:19:41 -05:00
Lirusaito
c96b840c53
Split off certain preferences into new Adv. Chat subtab Chat UI
...
From Text Chat: Disallow communicate shortcut opening detached friends list
From Vanity: Use horizontal buttons for contacts floater (needs restart)
The rest were in Chat/IM of Vanity.
2013-01-09 07:30:49 -05:00
Lirusaito
70445ab8a3
Add option for Horizontal buttons on Contacts floater.
...
Adds Use horizontal buttons for contacts floater (needs restart) to Vanity Preferences.
Adds ContactsUseHorizontalButtons.
Adds FloaterContactsHorizRect for saving horizontal contacts rect.
Adds panel_friends_horiz.xml, panel_group_horiz.xml, and floater_my_friends_horiz.xml
Also corrects string value for FloaterContactsRect
2013-01-08 20:21:15 -05:00
Aleric Inglewood
136e6dd389
New debug channel dc::snapshot.
2013-01-09 00:54:53 +01:00
Siana Gearz
94edef2c3f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-01-09 00:07:57 +01:00
Siana Gearz
1434e8d6e9
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-01-09 00:07:34 +01:00
Siana Gearz
54a53b574f
Follow fix and clean-up
2013-01-09 00:07:17 +01:00
Shyotl
c9954cf14e
Some cleanup missed in merge.
2013-01-08 17:07:05 -06:00
Shyotl
7ca974f731
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into sunshine
2013-01-08 17:06:08 -06:00
Shyotl
54771409d6
Merge branch 'master' into sunshine
...
Conflicts:
indra/llimage/llimage.cpp
indra/llui/llui.cpp
indra/newview/llvoavatar.cpp
2013-01-08 17:05:29 -06:00
Aleric Inglewood
63ae33eca7
Fix crash in AICurlPrivate::curlthread::PollSet::next
...
Introduced in
6dcda3595e
(Add recovery for randomly closed socket desciptors.)
By copying CurlSocketInfo* into mCopiedFileDescriptors, it was possible
that we accessed a deleted CurlSocketInfo for it's filedescriptor,
returning a random value, which, when passed to FD_ISSET could cause a
SIGSEGV.
I reverted this change and now store the literal socket descriptors in
mCopiedFileDescriptors again. It is not a problem when libcurl deletes
the corresponding CurlSocketInfo (through a callback to
MultiHandle::socket_callback) in that case, because the fd_set we test
against isn't updated as a result of that, not until we're down with
mCopiedFileDescriptors (at the re-entry of select()).
2013-01-08 23:43:25 +01:00
Lirusaito
b485048f6b
Show local chat bar in floater... (Needs restart)
2013-01-08 17:17:52 -05:00
Lirusaito
3ed2da9282
Once more change the behavior of minimizing new chats in open in separate floater mode, to be a little more truthful.
2013-01-08 14:53:08 -05:00
Drake Arconis
7aa95debf1
Merge branch 'master' into meshupload
2013-01-08 14:37:54 -05:00
Drake Arconis
f178de2ff8
Merge remote-tracking branch 'Lirusaito/master'
2013-01-08 14:37:45 -05:00
Drake Arconis
2d9402fd2d
Merge branch 'master' into meshupload
2013-01-08 14:37:25 -05:00
Aleric Inglewood
5188693469
Compile fix for last commit and Release
2013-01-08 20:33:29 +01:00
Lirusaito
68911876b9
Option to Disallow communicate shortcut opening detached friends list
...
Added CommunicateSpecificShortcut
Added checkbox to Text Chat preferences
2013-01-08 13:48:18 -05:00
Drake Arconis
10c19731b3
Merge remote-tracking branch 'Aleric/master'
2013-01-08 13:11:43 -05:00
Lirusaito
820b4ea358
Optionally, remove chatbar from local chat floater.
...
FloaterChatBarlessRect keeps the size of this separate, for those who want to switch by mood.
ShowLocalChatFloaterBar toggles this.
Show local chat bar in floater entry added to Adv. Chat prefs.
floater_chat_history_barless.xml added for this.
2013-01-08 12:16:51 -05:00
Aleric Inglewood
d8485350e7
Address clang warnings.
...
* Split off AIThreadSafeBitsPOD, because offsetof may only be used on POD types.
* Added ASSERT_ONLY and ASSERT_ONLY_COMMA
* Removed a few unused class members
* Fixed a bug in AIHTTPReceivedHeaders::equal that more or less only
compared the length of the headers before :/
2013-01-08 17:50:09 +01:00
Lirusaito
b4b6186f54
Re: 3ea353bef3, fix minimize case to minimize and not steal focus. Also apply to group chats.
2013-01-08 08:43:55 -05:00
Drake Arconis
8889f6b837
Merge remote-tracking branch 'Lirusaito/master'
2013-01-08 06:38:08 -05:00
Lirusaito
3ea353bef3
Change default behavior of separated non-local chats mode to open minimized.
2013-01-08 06:33:07 -05:00
Drake Arconis
ca746f3b47
Merge remote-tracking branch 'Lirusaito/master' into altcompilers
2013-01-08 06:17:47 -05:00
Drake Arconis
9f7e81cec2
Alt Compiler fixes
2013-01-08 06:17:39 -05:00
Drake Arconis
bc3ad59dd5
Revert "Fixed a build issue in clang"
...
This reverts commit 6d379448be .
2013-01-08 06:16:28 -05:00
Drake Arconis
979adcd6e2
Minor fix to OSX
2013-01-07 22:11:19 -05:00
Shyotl
c5c1294d7d
Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.
2013-01-07 20:12:14 -06:00
Drake Arconis
0ce91ce5ed
Build fixes
2013-01-07 18:44:51 -05:00
Lirusaito
67e4518132
Scroll to the object's texture if the user has a copy in their inventory. EXT-5403? Fixes part of Issue 501.
2013-01-07 18:32:54 -05:00
Drake Arconis
b76cb36c0f
Merge remote-tracking branch 'Lirusaito/meshupload' into meshupload
2013-01-07 18:31:02 -05:00
Lirusaito
0636f0049a
Rectify the problem in which profile images would be below the window border when first opened.
2013-01-07 18:20:02 -05:00
Drake Arconis
8346ce4cd8
Merge remote-tracking branch 'Aleric/meshupload' into meshupload
2013-01-07 18:10:38 -05:00
Drake Arconis
e565341e90
Merge branch 'master' into meshupload
2013-01-07 18:09:56 -05:00
Lirusaito
1b2c0ba02b
v-d llviewermenufile.cpp functions (and order) for meshupload, decide when Upload Mesh entry should be enabled.
2013-01-07 18:08:42 -05:00
Aleric Inglewood
cbbe678f9e
Remove FloaterModelPreviewRect
2013-01-07 23:31:40 +01:00
Aleric Inglewood
5efcc7186e
Fixed mesh file picker and then some
2013-01-07 23:12:09 +01:00
Aleric Inglewood
d188ecae70
Fix crash because of missing debug setting
2013-01-07 23:01:10 +01:00
Shyotl
d71210e942
Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)
2013-01-07 14:44:54 -06:00
Aleric Inglewood
9c20139ae8
Fix memory leak. This auto deletes the file picker, the old code did't.
2013-01-07 20:21:45 +01:00
Aleric Inglewood
da19e770a2
Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT
2013-01-07 20:11:18 +01:00
Aleric Inglewood
5e7acb9f3a
Add support for ".dae" (and others) to filepicker load filter.
...
* Brought llfilepicker.{cpp,h} up to speed with V3 by adding
FFLOAD_MODEL, FFLOAD_COLLADA, FFLOAD_SCRIPT, FFLOAD_DICTIONARY
However, note that we used FFLOAD_LSL, so I renamed their
FFLOAD_SCRIPT to FFLOAD_LSL and kept our way of filtering.
* Fixed the filter token that is sent to the plugin for
collada (from "dae" to "collada").
2013-01-07 20:00:54 +01:00
Drake Arconis
6d379448be
Fixed a build issue in clang
2013-01-07 11:59:25 -05:00
Aleric Inglewood
79763aacf7
Merge branch 'master' into meshupload
2013-01-07 17:59:21 +01:00
Aleric Inglewood
4b592f7507
Merge remote-tracking branch 'singu/master'
2013-01-07 17:58:53 +01:00
Aleric Inglewood
e7ef9eff4f
Merge branch 'master' into meshupload
2013-01-07 17:50:03 +01:00
Drake Arconis
9e2049c463
Added darwin and windows libraries and added copying of collada and glod
2013-01-06 21:58:26 -05:00
Drake Arconis
8aa7113480
Merge branch 'master' into meshupload
2013-01-06 21:46:34 -05:00
Drake Arconis
b1b9172f28
Merge branch 'meshupload' of https://bitbucket.org/LightDrake/singularityviewer-test into meshupload
2013-01-06 21:21:02 -05:00
Drake Arconis
3a691e0c23
Fixed linking
2013-01-06 21:20:41 -05:00
Aleric Inglewood
a9a308e5e9
Never freeze again.
...
Put snapshot related floaters always on top of the full screen preview.
Make having multiple running uploads more robust.
Fix infinite recursion when clicking on the bottom 'Snapshot' button
under certain conditions.
Unfreeze time more robust; unfreeze time out of precaution when
starting an upload (if 'Keep open' not checked).
Fixed a bug that caused all callbacks for successful feed uploads to be
ignored.
2013-01-06 23:40:53 +01:00
Lirusaito
e7f4fc7107
Added colors for mesh upload MeshImportTableNormalColor and MeshImportTableHighlightColor to default/colors_base.xml
2013-01-06 12:46:56 -05:00
Lirusaito
ac60260da2
Update LLFloaterModelPreview and make it compile~
...
Collada include_directories and llfloatermodelpreview.*s added to CMakeLists.txt
Update to v-d, compile with AIFilePicker, comment spelling fixes.
Upload Mesh... entry added to File menu.
Updated AIFilePicker to have FFLOAD_COLLADA with an mFilter of "dae"
And, finally, add floater_model_preview.xml~
2013-01-06 11:56:33 -05:00
Drake Arconis
364cf1ec73
Bug fix from v3
2013-01-06 09:47:02 -05:00
Drake Arconis
297c386b16
Fixed glod
2013-01-06 07:30:42 -05:00
Drake Arconis
152a3685fa
Merge branch 'master' into meshupload
2013-01-06 04:03:49 -05:00
Drake Arconis
bb7464a975
Merge branch 'master' of https://bitbucket.org/LightDrake/singularityviewer-test
2013-01-06 04:03:14 -05:00
Drake Arconis
9c1237ca05
Initial work.
2013-01-06 03:59:38 -05:00
Shyotl
69e0738096
Fix crash when using edit appearance.
2013-01-05 22:05:53 -06:00
Siana Gearz
cd27184332
Take out buggy padding removal in OJ
2013-01-06 04:01:28 +01:00
Drake Arconis
cadf654fae
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-05 20:50:49 -05:00
Siana Gearz
d5892bbb32
My preliminary thoughts on OpenJPEG
2013-01-06 02:38:12 +01:00
Shyotl
0b31537bfe
Updated llfile so that llofstream and llifstream actually work when given a file handle.
2013-01-05 17:13:35 -06:00
Shyotl
776a977824
Completed code migration to LLAvatarAppearance
2013-01-05 17:12:02 -06:00
Siana Gearz
20ae72e5fa
CMake needs proper quoting
2013-01-05 23:25:47 +01:00
Siana Gearz
7fc4348f64
Fix build deselect
2013-01-05 22:14:10 +01:00
Lirusaito
5ec116021a
Feature request: Alt-R for Region/Estate floater
2013-01-05 01:45:55 -05:00
Lirusaito
a992333744
Zi Ree's Debug Setting Floater awesomeness (Search!!)
...
Made to work with Singularity, and also be a bit better..
Alphabetizes includes.
Switches settings combobox to a scrolllist, and Boolean combobox to a radiogroup.
Makes floater resizable, aligns a lot of the UI, and prepares it all for proper resize behavior.
Adds Copy button for copying the name of the debug setting.
Yay, verbosity! Also adds FloaterDebugSettingsRect to keep track of the floater's size.
Also somehow the getInstance line snuck out of last commit... tossed it in here.
2013-01-05 01:43:17 -05:00
Shyotl
5cf091b8b2
Completed code migration from LLViewerWearable to LLWearable.
2013-01-05 00:33:55 -06:00
Shyotl
bea4bc6a1a
Brought over lltexglobalcolor
2013-01-04 21:15:35 -06:00
Shyotl
9596514c79
Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata
2013-01-04 20:50:35 -06:00
Siana Gearz
fefe0df922
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-01-03 23:37:00 +01:00
Siana Gearz
509bdcb891
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-01-03 23:36:55 +01:00
Aleric Inglewood
2fbd53807c
Do not use LLCachedControl as global variables.
2013-01-03 23:25:18 +01:00
Lirusaito
9498375e75
Update LLFloaterSettingsDebug to match up with v-d.
...
Adds boost::bind and makes the floater a singleton.
2013-01-03 17:20:57 -05:00
Aleric Inglewood
639b264d2d
Do not crash upon corrupted HTTP header.
...
This addresses the reported assertion by luis thibodeaux.
2013-01-03 21:06:20 +01:00
Lirusaito
c3829485e4
Fixed LLCompileQueue messages via update to v-d in parts. Script resets now output properly~
2013-01-03 14:08:39 -05:00
Lirusaito
88de1b28a2
Add MoyMiniMapCustomColor swatch to Vanity Preferences.
...
Fixed spacing of MoyMiniMapCustomColor in settings_ascent_coa.xml and removed it from settings_per_account.xml
TODO: Make MoyMiniMapCustomColor more flexible.
-Added ColorCustomChat checkbox, pref code, and setting commented out.
2013-01-03 13:59:14 -05:00
Lirusaito
a50f0008b2
Variable Size Regions! Support for prehash RegionSizeX and large patches. (WIP)
...
Mostly from Ukando, tweaked a bit to be cleaner, and a little less dramatic.
decode_patch_header now takes a bool optionally, as third argument.
_PREHASH_RegionSizeX is the only used of the two _PREHASH_RegionSize*.
llsurface.cpp: Copy the connectNeighbor for variable size regions almost directly from Ukando
llsurfacepatch.cpp: Patch code from ukando and voodoo.
Changed hardcoded 256 constants and such to width functions in: llglsandbox.cpp, llsurface.cpp, llviewerregion.cpp, llviewerparcelmanager, llviewerparcelmgr.cpp, llvowater.cpp, llworld.cpp
Use region specific width in: llagent.cpp, llglsandbox.cpp, llmanip.cpp, llmanipscale.cpp, llpanelobject.cpp, llviewerbject.cpp, llwind.cpp
Use 256 in llnetmap.cpp in places...
llfloaterregioninfo.cpp: Aurora grid has wacky textures.
Add LLViewerParcelMgr::widthUpdate() for updating mParcelsPerEdge given a region's width. Used in llstartup now.
Add LLWorld::setWidth() for getting a region's size from LLMessageSystem pointers and setting mWidth and mWidthInMeters, accordingly. Called in llviewermessage.cpp as well.
2013-01-03 05:57:55 -05:00
Siana Gearz
17e0c79fe7
Build fix Linux
2013-01-03 03:03:06 +01:00
Siana Gearz
ddef80d2cf
Revert "Attempt to fix frame timer on broken mainboards"
...
This reverts commit 5eb99b7d2f .
2013-01-03 03:02:15 +01:00
Siana Gearz
1872337f5f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-01-03 02:17:20 +01:00
Siana Gearz
6e219f0a4e
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2013-01-03 02:15:51 +01:00
Shyotl
a408c2211b
Workaround for targetomega'd objects turning jittery when zoomed in on.
2013-01-02 18:42:26 -06:00
Siana Gearz
8b2dcb6cb0
We're supposed to use HTTP bake fetch now
2013-01-03 00:10:56 +01:00
Aleric Inglewood
b0fe12f597
Snapshot Freeze Time: add Langolier tag for new (invisible) avatars.
...
If an avatar TP's in while you are in Freeze Time mode, they now have a
visible tag with the tag 'Langolier' in it. After exiting Freeze Time
mode they become visible. Before they would stay invisible.
2013-01-03 00:02:28 +01:00
Siana Gearz
9a1cc8b9a8
Translation cleanup script fix
2013-01-02 23:47:05 +01:00
Siana Gearz
cce4d50378
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2013-01-02 23:00:46 +01:00
Siana Gearz
e732e62b39
Tiny cleanup
2013-01-02 22:56:04 +01:00
Lirusaito
728056acdb
Add support for Aurora's extended land layer codes to llvlmanager.cpp
2013-01-01 20:15:21 -05:00
Lirusaito
b85d282dfb
WindLightRefresh added for compliance with Aurora's windlight event system.
2013-01-01 18:09:45 -05:00
Lirusaito
194902798b
HippoGridManager and HippoLimits updated with Aurora bits from Voodoo.
...
Adds isAurora() to HippoGridManager
Adds setAuroraLimits and Aurora case to setLimits() in HippoLimits
2013-01-01 18:04:39 -05:00
Aleric Inglewood
cc276ff232
More snapshot UI tweaks.
2013-01-01 22:34:22 +01:00
Aleric Inglewood
5538fe27e5
Snapshot improvements.
...
* Warn when it was not possible to make a snapshot because the difference
between the aspect of the required target size and the required target
aspect itself is too large.
* Reset Feed and Postcard Aspect to Default when making a new snapshot.
* Fixed a rounding error that caused one-pixel size error.
2013-01-01 21:30:13 +01:00
Lirusaito
c0ba3e95f3
Ability to change default behavior of Chats being torn off so that all chats appear minimized upon opening, as well, regardless of conditions.
...
Adds debug setting OtherChatsTornOffAndMinimized
Not added to ui xml because the default behavior is likely fine.
2012-12-31 19:06:23 -05:00
Lirusaito
4ec6f853d8
In-Group feature request: Ability to have chats torn off, by default.
...
Best viewed without space changes... or maybe it doesn't matter any more.
Debug setting OtherChatsTornOff added.
Added Open new IMs in separate floaters checkbox to Adv. Chat.
Moved Show group name in chat to the right column on top of Adv. Chat panel.
So how's this work?
Two ways.. 1. The user opens a chat; 2. A chat is started from another party to the user.
In 1, we open the chat in a separate floater and focus the floater.
In 2, we check if there is a floater currently in focus before opening the chat
if so, we minimize the floater, setting focus back to whatever floater the user was focused on;
if not, we leave the new chat floater open and focused.
Note that this will NOT alter the default behavior at all, we can't be having that.
2012-12-31 17:06:30 -05:00
Aleric Inglewood
6dcda3595e
Add recovery for randomly closed socket desciptors.
...
Although it should never happen that a file descriptor is suddenly
closed, it appeared that this happens on linux 64bit when using
FMODex... Not really sure how useful this is, but at least now the
viewer just continues to work, as if -say- the socket was closed
remotely. Before the curl thread would go into a tight loop that it
wouldn't recover from until the watchdog thread terminated the viewer.
2012-12-31 19:24:37 +01:00
Aleric Inglewood
c4a9eb9e44
Work around for 'version `OPENSSL_1.0.0' not found'
...
When linking against the prebuilt libcrypto.so.1.0.0 and
libssl.so.1.0.0 there is a problem running the viewer in
gdb (on debian) because gdb links with libpython2.7.so
which needs a newer openssl on my system (OPENSSL_1.0.1).
The patch allows to work around this problem by defining
-DUSE_SYSTEM_OPENSSL:BOOL=ON when configuring, which then
causes the viewer to be compiled against the system libs.
(If you already installed the prebuilt, you have to manually
remove them with script/install.py --uninstall openSSL).
The prebuilt libcurl expects a function SSLv2_client_method
however, which is not present in my openssl system libs.
A stub was added which is possible because the function
in question isn't used anyway.
2012-12-31 16:15:36 +01:00
Lirusaito
ba57bb1396
In-group feature request: Allow coloring chat of special people (Friends, Estate Owner, Lindens, Muted Residents)
...
Added ColorFriendChat, ColorEstateOwnerChat, ColorLindenChat, and ColorMutedChat.
Did some spaces to tabs work, view without space changes.
Add checkboxes beneath corresponding color swatches and "Use colors for chat:" text to Vanity.
Fix Ascent*Color Comments strings.
Also fix the issue where clicking ones name in a group chat would result in it opening a random profile.
2012-12-31 06:24:35 -05:00
Lirusaito
f94f4a1191
Satisfy Issue 100: When timestamp it set to include seconds, the seconds do not get included with IM & chat logs.
...
Best viewed without space changes.
SecondsInLog debug setting added.
Seconds in Log timestamps checkbox added to Adv. Chat prefs.
2012-12-31 04:54:59 -05:00
Lirusaito
469f76e690
Added "Request New Feature..." to Help->Bug Reporting menu.
2012-12-30 16:21:01 -05:00
Lirusaito
0098466704
Fix for WordFromTheWise's missing lsl strings issue.
2012-12-30 16:09:08 -05:00
Lirusaito
48ddfd25d4
Skins request! Black Red, Black Light Blue, and Black Dark!
2012-12-30 16:07:07 -05:00
Aleric Inglewood
2f3841d7e6
Update of print_diagnostics.
...
CURLE_COULDNT_CONNECT only happens when we actually get
an error (ie, 'connection refused'). If we time out while the connect
attempt is still running then we get CURLE_OPERATION_TIMEDOUT.
2012-12-30 21:11:10 +01:00
Lirusaito
1cde242f06
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-12-30 14:05:35 -05:00
Damian Zhaoying
a0b227fdd8
fixes and UI translations tweeks to fit in spanish language
2012-12-30 15:38:11 -03:00
Aleric Inglewood
36a79d7cbe
Merge remote-tracking branch 'shyotl/master'
2012-12-30 02:57:11 +01:00
Lirusaito
2c491bc905
Break out LLMakeOutfitDialog.
...
Added "Make Outfit..." to Edit menu and Create->"New Outfit" to inventory floater menu.
Cleaned up LLMakeOutfitDialog, using boost::bind and less waste.
Moved onMakeOutfitCommit() to LLMakeOutfitDialog as makeOutfit()
Also changes LLFloaterCustomize's callbacks to use boost::bind
Give new outfit dialog a title instead of a heading.
Small fix to mistake with AnnounceSnapshots xmlstuffs.
2012-12-29 19:24:17 -05:00
Aleric Inglewood
a25c405eae
Fix assert after failed login.
...
reset_login(), among others, sets the state back to STATE_LOGIN_SHOW,
which then causes gViewerWindow->initWorldUI() to be called, which
is the (only) function that calls
LLMenuOptionPathfindingRebakeNavmesh::initialize.
In other words, it's perfectly normal to enter that function
a second time and the assert is erroneous.
2012-12-29 18:08:46 +01:00
Aleric Inglewood
e666c60e7d
Merge remote-tracking branch 'singu/master'
2012-12-29 17:05:15 +01:00
Aleric Inglewood
6a45e68c73
Merge branch 'master' into llwebprofile
2012-12-29 17:03:46 +01:00
Aleric Inglewood
59b313352b
Third time I have to fix this... weird
2012-12-29 17:03:16 +01:00
Aleric Inglewood
9e04f9ba80
Enable/disable upload/send button correctly.
...
Passes an 'index' magic number to the upload/save functions which
pass that back to the *Done callbacks, so we know if the *raw*
snapshot is still up to date when the upload succeeds or fails.
2012-12-29 16:51:29 +01:00
Lirusaito
cf5838505f
In-world feature request: Announce in chat when someone has taken a snapshot.
...
AnnounceSnapshots debug setting.
"Announce when someone takes a snapshot" added to Vanity Main Preferences.
took_a_snapshot translatable string added to strings.xml
Also in this commit:
Turned PlayTypingSound check into LLCachedControl.
In preparation for the crippling of all old viewers, the Vanity Main tab shall henceforth only be called Main, not Main (General)
This change has been made in the code comments and the UI itself.
2012-12-29 07:58:06 -05:00
Lirusaito
23469c00de
Satisfy Issue 411: Song list in local chat - not a floater
...
AnnounceStreamMetadata debug setting.
"Announce music stream's metadata in local chat when tuned in" checkbox added to vanity main preferences.
Made the words Title and Artist translatable, as well as the "Now playing" string.
2012-12-29 07:45:05 -05:00
Siana Gearz
66083d6531
Removing leftover dead code
2012-12-28 21:07:19 +01:00
Aleric Inglewood
1c3748e923
Merge remote-tracking branch 'lirusaito/llwebprofile' into llwebprofile
2012-12-28 17:04:29 +01:00
Aleric Inglewood
88bf01fe6f
Avoid crashing at exit by joining the curl thread.
2012-12-28 16:59:04 +01:00
Siana Gearz
a969a8f99c
UseNewTargetOmegaCode loosely ported from Henri
2012-12-28 16:46:06 +01:00
Aleric Inglewood
ef0e34a278
Do not attach cam to avatar in Freeze Time mode.
...
We do, and the avatar moves then the cam jumps
away from the frozen avatar to where it really is.
Unfortunately, it's still not possible to attach
the cam to moving objects with this patch.
Also, scripted changes to objects are still visible,
like changes in local lights of texture full brightness.
2012-12-28 16:40:08 +01:00
Lirusaito
50eb45991d
"attachments and wearables", not "clothing and wearables"
2012-12-28 02:13:50 -05:00
Lirusaito
ffa405dad9
Comment cleanup.
2012-12-28 01:25:11 -05:00
Lirusaito
1f966eb6c3
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-12-28 01:21:28 -05:00
Lirusaito
b503540075
Always remember to save after making a change. (Location works now)
2012-12-28 00:33:08 -05:00
Lirusaito
2be305d39e
Improvements!
...
Fix CMakeLists being out of order.
Add setting SnapshotFeedAddLocation to keep track of user's preference whether or not to include location in uploads to profile feed.
Clean up LLFloaterFeed to take only what it needs, also gave it a boost~
Remove saveFeed() from LLFloaterSnapshot, removing the dependency on LLWebProfile.
Compile fixes for LLFloaterSnapshot.
Prettied up the upload to feed floater.
TODO: Does Location even work? I can't get it to appear, never seems to get used right in v-d either.
2012-12-28 00:14:54 -05:00
Shyotl
f6ee966e17
Clean up LLAvatarListEntry creation/destruction and resolve LLAvatarPropertiesProcessor retaining deleted observers.
2012-12-27 21:59:59 -06:00
Drake Arconis
246315c723
This is the Cupcake Commit. Cupcakes. Also may fix linux fmodex64.
2012-12-27 15:15:27 -05:00
Aleric Inglewood
be8f16a8e6
Disable upload/send button immediately.
...
Immediately disables button and reenables it
again when upload/save was a failure.
The callback is now ignored if the snapshot
was refresh in the meantime.
2012-12-27 19:02:58 +01:00
Aleric Inglewood
32614d3539
Compile bug fix
2012-12-27 17:38:28 +01:00
Aleric Inglewood
aab978c7ea
WIP: floater_snapshot_feed.xml and code.
...
This is just a skeleton, roughly copied from the Postcoard
code, which is very similar. Nothing in indra/newview/llfloaterfeed.cpp
has been changed yet, apart from a few deletions (to make it compile)
and the literal replacement of "Postcard" with "Feed".
indra/newview/llfloatersnapshot.cpp was updated however to
open the new floater when one tries to upload a snapshot to the feed.
It is still needed to make a callback to saveFeed(), or rather to
move that function to the saveFeed that is in llfloatersnapshot.cpp.
2012-12-27 17:13:47 +01:00
Lirusaito
d4b48fae6f
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-12-26 15:50:38 -05:00
Lirusaito
0433bd8560
Gemini young age color should look more natural for Gemini.
2012-12-26 13:09:05 -05:00
Shyotl
71eb0fedd9
Merge branch 'master' of git://github.com/lkalif/SingularityViewer.git
2012-12-25 06:17:42 -06:00
Latif Khalifa
9056ae72d3
Point library downloads to bitbucket since github is depreciating binary downloads
2012-12-25 11:57:59 +01:00
Latif Khalifa
430a5359ac
Merge remote-tracking branch 'upstream/master'
2012-12-25 11:47:32 +01:00
Inusaito Sayori
5468bc8447
Fix compile warning/error in aihttptimeoutpolicy.cpp
2012-12-25 04:53:16 -05:00
Inusaito Sayori
059005a4a7
Fly after teleport, off by default.
2012-12-25 04:47:07 -05:00
Shyotl
3ca39ab3f1
Client-side maturity handling when teleporting. Adds new notification that asks if you want to change maturity settings with a single click and automatically re-fire the teleport request.
2012-12-25 02:30:51 -06:00
Shyotl
f8a6e2e19f
Moved region rebake button to 'Tools' menu
2012-12-25 02:27:15 -06:00
Shyotl
1f5c2095a5
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2012-12-24 18:26:52 -06:00
Shyotl
afaaba6b3c
OSX was choking on transformfeedback shaders. Make failure to load such shaders non-critical to the shader loading process. Also clean up glColorMask state properly in wlsky.
2012-12-24 17:56:32 -06:00
Shyotl
5ada2d4b6f
OSX was choking on transformfeedback shaders. Make failure to load such shaders non-critical to the shader loading process. Also clean up glColorMask state properly in wlsky.
2012-12-24 17:55:05 -06:00
Shyotl
dd15b9234f
Migrated LLTexLayerParams. Renamed LLTexLayerSet(Buffer) to LLViewerTexLayerSet(Buffer), and provided simple bases in llappearance/lltexlayer.h to mimic new usage. Reworked various bits to work with these changes, and performed some basic cleanup of LLVOAvatar(Self)
2012-12-24 17:20:46 -06:00
Aleric Inglewood
c85f976ed6
Fix outbox notifications.
2012-12-24 22:08:44 +01:00
Aleric Inglewood
b22832ba54
Fix cookie handling.
...
Cookies are now collected during redirects, one the last cookie
of a given name is kept. Cookies are then set by looking for
the right cookie name (instead of what viewer 3 does: just
use the last cookie that was set).
This fixes the merchant outbox.
2012-12-24 19:58:54 +01:00
Inusaito Sayori
977f17a893
Add feature to Continue flying upon standing, if the user was flying when they sat down.
...
A couple users said this could be handy.
Useful for birds, fairies, and otherwise flying critters.
2012-12-24 05:24:57 -05:00
Inusaito Sayori
60621a300c
Satisfy in-world feature request: Avatar Count on Radar.
2012-12-24 03:09:09 -05:00
Aleric Inglewood
fac3fc67b6
Add filtering for curl debug output.
...
Add CURLTR debug channel for libcurl API calls,
and use CURLIO only for libcurl debug output.
Note: need to set gDebugCurlTerse to true for
filtering to take effect, then pass 'debug_on'
to the LLHttpClient methods that require debugging.
2012-12-24 02:54:36 +01:00
Shyotl
d03d145be4
Pulled LLAvatarJointMesh out of LLViewerJointMesh.
2012-12-23 18:33:35 -06:00
Inusaito Sayori
8e3da75c3c
Missed a spot for 487.
2012-12-23 15:10:53 -05:00
Shyotl
1083d7e0ef
Added LLGLTexture. Virtually completely virtual for now. Also added LLTextureManagerBridge, although not yet utilized.
2012-12-22 23:58:42 -06:00
Shyotl
cdaa4b4e99
Clear up a few issues revealed upon forced full recompile. (VS is dumb sometimes)
2012-12-22 23:44:43 -06:00
Inusaito Sayori
c9dc2eaad4
Satisfy Issue 487: Walking Backwards, Turning Around
...
TurnAroundWhenWalkingBackwards added.
Turn Around When Walking Backwards added to Vanity Main Preferences.
Code borrowed, in part, from Firestorm.
2012-12-23 00:26:49 -05:00
Shyotl
295fcb53b0
Migrate llviewervisualparams to llappearance project.
2012-12-22 17:17:00 -06:00
Shyotl
389c35e08e
Pulled LLAvatarJoint out of LLViewerJoint
2012-12-22 16:30:38 -06:00
Aleric Inglewood
8095d6c48c
Large snapshot update (part 3)
2012-12-22 19:07:08 +01:00
Inusaito Sayori
6f2e192947
Complete Issue 545: OSSL Updates
...
Updates keywords.ini, lsl_functions_os.xml, and en-us/strings.xml
Thanks WhiteStar, ThiteStar.
2012-12-22 12:25:46 -05:00
Inusaito Sayori
0b9d8c7b47
Satisfy Issue 512: Increase RenderVolume LOD Factor Threshold to 4.000
...
Phoenix users are used to this.
The setting clamps to the max here, so it must be 4.
2012-12-22 05:29:21 -05:00
Inusaito Sayori
1ecea32933
An hour is not a circle.
2012-12-22 02:07:36 -05:00
Inusaito Sayori
ceae4470f5
Fix a windows compiley thing.
2012-12-21 05:49:14 -05:00
Lirusaito
237455f4b7
Use boost::date_time for displaying avatar age.
...
llpanelavatar change may be better viewed without space changes.
2012-12-20 23:34:05 -05:00
Lirusaito
3d25f8ee79
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-12-20 09:25:33 -05:00
Lirusaito
86572462e6
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-12-20 09:25:21 -05:00
Lirusaito
245eaa1fd9
Satisfy radar issues: 51(Avatar Age), 382(Time duration), 245(Hide columns on command)
...
Overall:
Extras tab added to radar.
Activities given tool_tip strings, TODO: Get icon entries to have tool_tips.
Added tab_min_width="0" to tab container so tabs take up only as much space as necessary.
Issue 51:
RadarAlertAge, AvatarAgeAlertDays debugs added.
RadarTextYoung color added to colors_base and gemini.
UI bits added to radar.
ALERT_TYPE_AGE, LIST_AGE, and boost::lexical_cast added.
LLAvatarListEntry is now derived from LLAvatarPropertiesObserver for processProperties and all that fun stuff. Also has mAgeAlert and mAge.
processProperties is basically copied directly from LLAvatarPanel, it can probably be bettered.
Issue 382:
mTime, getTime(), LIST_TIME
Time column.
Issue 245:
Hide columns text and checkboxes added to UI.
assessColumns() now used to determine which columns to show. Also once used during postBuild()
col_helper() function added to help decide to hide or resize a column based on given params.
checkboxes all use assessColumns as callback.
RadarColumn* debug settings added.
If you read this all, that's a sign the 'pocalypse is coming.
2012-12-20 08:58:18 -05:00
Shyotl
003aa6a4eb
Migrate llpoly* files to llappearance
2012-12-20 02:55:34 -06:00
Shyotl
f9d205b869
Intermediary commit. Exploit virtuals to 'emulate' real llavatarappearance.h.
2012-12-20 02:53:45 -06:00
Shyotl
e08afcb963
Created llappearance project. Migrated llvoavatardefines and llwearabletype.
2012-12-20 00:00:17 -06:00
Damian Zhaoying
e7b712660e
update spanish translations
2012-12-19 23:29:36 -03:00
Shyotl
3750123e43
Obsessive excessive clearing of glow rendertargets, as they still occasionally act weird.
2012-12-19 19:08:10 -06:00
Shyotl
b20f39d09f
Retain shader error logs across entire session.
2012-12-19 19:06:59 -06:00
Inusaito Sayori
c35f762826
Satisfy Issue 476: Option to mute gesture sounds
...
Enable Gesture Sounds checkbox added to Adv. Chat->Spam tab.
2012-12-19 03:35:06 -05:00
Shyotl
7eda762c28
Cheapo sun bloom contribution in deferred.
2012-12-19 02:30:44 -06:00
Shyotl
0460769eea
Unified moon/star rendering to share same shader. Also now actually using deferred shader when performing deferred rendering.
2012-12-19 01:52:10 -06:00
Shyotl
d3939c785d
Fixup scroll list column header resizing.
2012-12-18 18:27:59 -06:00
Inusaito Sayori
66386d6eec
Fix an issue introduced in V2MultiWear in which double-clicking or hitting an enter on a worn wearable would rewear it, not detach it.
2012-12-17 19:32:40 -05:00
Inusaito Sayori
9e8dafc4ca
Satisfy Issue 167: Ability to set global "add instead of wear" option in prefs
...
Adds debug setting LiruAddNotReplace.
Adds "Add clothing and wearables instead of replacing them" to Main (General) tab of Vanity Preferences.
2012-12-17 17:17:12 -05:00
Inusaito Sayori
36a698fee4
Satisfy Issue 271: Fly after teleport feature.
...
Add debug setting LiruFlyAfterTeleports
Add Always fly after Teleports to General tab of System preferences.
(Also, fixed tabs where spaces should be in settings.xml)
2012-12-16 20:50:40 -05:00
Aleric Inglewood
aab764a6e5
Don't crash when user forgets last name on non-SL grids.
2012-12-16 23:39:58 +01:00
Aleric Inglewood
11f30bc28d
Removed gFullName which isn't used anywhere
2012-12-16 23:17:10 +01:00
Inusaito Sayori
46b5595c3f
Don't leave Group Copy check enabled unless we have trans and copy perms.
...
Also some code consistency chages that won't change anything.
2012-12-16 15:32:06 -05:00
Inusaito Sayori
c380f1f399
Don't show Paste As Link when Paste As Copy is shown enabled because it'll just be disabled in these cases.
2012-12-16 15:31:53 -05:00
Shyotl
184882e916
Remove dead code from llfloaterworldmap, and a tweak to lluictrl that I could've sworn I already did.
2012-12-16 13:30:29 -06:00
Aleric Inglewood
a9963bcdb3
In FreezeTime mode, keep avatars that TP away.
...
If an avatar TP's away (or quits), he will not
disappear anymore from a frozen scene. Unfreezing
makes him disappear of course (and clean up).
Known bug: if during Freeze Time mode someone
TPs away and then back, then he becomes a cloud
after Freeze Time is ended, which can only be
reset by another teleport (or relog) from either
the cloud or the one seeing him as cloud.
I decided not to fix this, cause there are things
with a higher priority and this - if it happens
at all - is rare and easy to recognize and work
around.
2012-12-16 00:13:06 +01:00
Aleric Inglewood
e0c0da7dff
In Freeze Time re-show fullscreen preview when clicking thumbnail.
2012-12-15 02:20:53 +01:00
Shyotl
6c9df4574c
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2012-12-14 16:59:49 -06:00
Shyotl
034c83f996
Added trivial diagnostic message regarding teleport handling.
2012-12-14 16:28:18 -06:00
Shyotl
2b582b169b
Mute list, now with 100% more text-appearing-ness, and 20% new shinies (mute-type icons, multi-select unmute, and displayname support).
2012-12-14 16:24:51 -06:00
Aleric Inglewood
cfa8df0575
Merge branch 'master' into llwebprofile
2012-12-14 20:43:17 +01:00
Aleric Inglewood
c34f2941aa
Merge remote-tracking branch 'github/master'
2012-12-14 20:41:18 +01:00
Aleric Inglewood
555b397067
Install vivox runtime also on standalone when linux64
2012-12-14 20:40:27 +01:00
Inusaito Sayori
38f59e640c
We canUndo and canRedo when we have a MoveableObject, not necessarily an EditableObject
2012-12-14 11:30:56 -05:00
Aleric Inglewood
65ce7dabe3
Merge remote-tracking branch 'github/master'
2012-12-14 16:42:27 +01:00
Aleric Inglewood
4d7d3ea937
Compile fix for non-standalone with DEBUG_CURLIO
...
Oops, that option doesn't exist in the prebuilt curl version.
2012-12-14 16:40:03 +01:00
Aleric Inglewood
15b6593143
Large snapshot update (part 2)
2012-12-14 02:31:08 +01:00
Inusaito Sayori
af1e7b346e
Vignette is Awesome, its panel should reflect that!
2012-12-13 16:53:19 -05:00
Shyotl
7a2f572eaa
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
2012-12-12 13:13:26 -06:00
Aleric Inglewood
4bb3ed0d85
Login crash bug fix.
...
XMLRPCResponder constructor was missing.
This fixes the following crash signature:
VIEWER : 2012-12-12T14:25:13Z INFO("AppInit"): setStartupState: Startup state changing from STATE_LOGIN_NO_DATA_YET to STATE_LOGIN_DOWNLOADING
VIEWER : 2012-12-12T14:25:14Z INFO("AppInit"): transferRate: Buffer size: 1308 B
VIEWER : 2012-12-12T14:25:14Z INFO("AppInit"): transferRate: Transfer rate: 11 kb/s
Program received signal SIGSEGV, Segmentation fault.
0x00007ffff33df7f5 in XMLRPC_RequestGetData () from /usr/lib/x86_64-linux-gnu/libxmlrpc-epi.so.0
(gdb) bt
Reason was that if the server replied with some error code then
mResponse was undefined.
I also added code to retry three times in that case;
the http status code that I get was 503, which really
mean "Service *temporarily* unavailable", so a retry
is in order.
2012-12-12 16:27:32 +01:00
Aleric Inglewood
5fe0820e13
Login crash bug fix.
...
XMLRPCResponder constructor was missing.
This fixes the following crash signature:
VIEWER : 2012-12-12T14:25:13Z INFO("AppInit"): setStartupState: Startup state changing from STATE_LOGIN_NO_DATA_YET to STATE_LOGIN_DOWNLOADING
VIEWER : 2012-12-12T14:25:14Z INFO("AppInit"): transferRate: Buffer size: 1308 B
VIEWER : 2012-12-12T14:25:14Z INFO("AppInit"): transferRate: Transfer rate: 11 kb/s
Program received signal SIGSEGV, Segmentation fault.
0x00007ffff33df7f5 in XMLRPC_RequestGetData () from /usr/lib/x86_64-linux-gnu/libxmlrpc-epi.so.0
(gdb) bt
Reason was that if the server replied with some error code then
mResponse was undefined.
I also added code to retry three times in that case;
the http status code that I get was 503, which really
mean "Service *temporarily* unavailable", so a retry
is in order.
2012-12-12 16:14:32 +01:00
Shyotl
28a4101d4d
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2012-12-12 03:12:08 -06:00
Shyotl
cc22edcce3
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2012-12-12 03:11:50 -06:00
Shyotl
2424d2a082
A little bit of postprocess shader tinkering.
2012-12-12 03:10:05 -06:00
Lirusaito
b1ccb70277
Added isClipboardPasteableAsCopy() to decide when not to show Paste As Copy
2012-12-11 15:15:41 -05:00
Shyotl
c641cc6394
Fix object list in About Land floater. (whoops)
2012-12-10 20:02:47 -06:00
Shyotl
9a6568f5e8
A little bit of bloom on indirect shiny reflections in deferred.
2012-12-10 20:00:57 -06:00
Shyotl
3627b33eec
Reworked flexi update handling a little bit.
2012-12-10 19:55:17 -06:00
Lirusaito
702eb95b84
Add Paste As Copy to inventory menu...
...
The opposite of Paste As Link, this will make copies of everything in the paste buffer,
allowing the user to copy bunches of items or links and simply paste them to make new copies.
Also appears when not needed... unsure how to go about removing, maybe comment out in release?
2012-12-10 19:39:55 -05:00
Lirusaito
03f191f47d
Satisfy Issue 494: Inventory: Copy links (without "find original")
...
http://code.google.com/p/singularity-viewer/issues/detail?id=494
Patch by Kitty Barnett, slightly modified by myself.
2012-12-10 16:42:06 -05:00
Lirusaito
813a4b0200
Fix warning: unused variable ‘len’ in release builds.
2012-12-10 13:26:48 -05:00
Lirusaito
c24950b261
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
...
Conflicts:
indra/newview/llfloateravatarpicker.cpp - Includes to v-d style, since plain alphabetical just won't cut it. Shyotl's changes for name system, here.
indra/newview/llpanelgroupinvite.cpp - Shyotl's changes for name system, here.
Also corrected new README to have less typos and be slightly more accurate.
2012-12-10 11:24:25 -05:00
Shyotl
806abb1985
Reduce required number of glow rendertargets by 1...
2012-12-10 01:31:57 -06:00
Shyotl
a4591a5eaa
Fix for friends list not resorting upon avatar online status change. Also did some minor cleanup
2012-12-09 17:05:54 -06:00
Siana Gearz
018737eb15
Blind Windows compile fix
2012-12-09 04:53:35 +01:00
Siana Gearz
3e5bd4e13b
Linux build fixes
2012-12-09 04:25:01 +01:00
Siana Gearz
98ec8b9910
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-12-09 03:27:52 +01:00
Siana Gearz
d2a966f363
OpenJPEG 1.5.2
2012-12-09 02:10:16 +01:00
Shyotl
8a7cc9259c
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2012-12-08 17:13:07 -06:00
Shyotl
382fc710e5
Disable octree statistics gathering.
2012-12-08 17:07:15 -06:00
Shyotl
be4229867a
Occlusion-fudge was incorrectly defaulting to zero.
2012-12-08 16:56:06 -06:00
Shyotl
6b05022530
Applied Tofu Linden's SSAO improvements. e189d55a7b
2012-12-08 16:51:38 -06:00
Shyotl
08a3828cc9
Applied Tofu Linden's water atmospherics improvements.
...
59f73ee6a1 &
43fdcb8d84
2012-12-08 16:50:35 -06:00
Shyotl
d5efedf51b
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into CT3Merge
2012-12-08 13:39:55 -06:00
Aleric Inglewood
8394a96fa8
Fix of TEXTBOX of group owned object.
...
Fixes http://code.google.com/p/singularity-viewer/issues/detail?id=548
2012-12-08 20:30:00 +01:00
Shyotl
4f7e869509
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into CT3Merge
2012-12-08 01:03:29 -06:00
Shyotl
7aac61859f
Avoid excess calls to gGL.flush when bound texture hasn't actually changed.
2012-12-08 01:01:47 -06:00
Shyotl
3ba967bdc1
Update to LLAvatarNameCache and consumers.
2012-12-08 00:59:37 -06:00
Shyotl
9fb4e677a6
Updates to LLScrollListCtrl and related inter-dependencies. Also added ability to set face texture to 'None' (LLUUID::null).
2012-12-08 00:56:58 -06:00
Lirusaito
1ffb5aa6fe
LLFloaterAvatarList RLVa: Don't announce people are in range when the user is blind.
2012-12-06 22:17:44 -05:00
Lirusaito
0100cd2f36
More of e2b011590d
...
Fixing up the name system, missed two parts.
2012-12-06 21:04:06 -05:00
Aleric Inglewood
d6b486524c
Fix include of reader.h
2012-12-07 00:31:10 +01:00
Shyotl
f80394fc02
llpreviewgesture.cpp changes snuck past me in an early commit.
2012-12-06 17:19:10 -06:00
Shyotl
e750c598be
Updated avatar radar. Focusprev/focusnext now obey the order of the actual displayed avatar list. Cleaned up some commit callbacks.
2012-12-06 17:16:44 -06:00
Shyotl
26191dd274
Migrate to boost::bind for a bunch of CommitCallbacks. Converted several static member functions to nonstatic member functions
2012-12-06 17:13:17 -06:00
Aleric Inglewood
12171f6cd9
Merge commit '5947769812369a7988a7f1db30df79e6fc0e4787'
...
Adds important commits from llwebprofile branch
into master which need to go into the next release.
2012-12-05 22:27:21 +01:00
Lirusaito
457276fa5d
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-12-05 13:59:36 -05:00
Lirusaito
7ba21ac4fd
Show Highlight and Edit Axis at Root on build floater
...
Thanks for the help, Naudia Nadezda!
2012-12-05 12:06:10 -05:00
Lirusaito
e2b011590d
Fix up the Name System just a little bit more.
...
Better viewed without space changes
Pretty much add support for sending LLAvatarName and std::string to become a name via the system...
Also a bit of a revert for llcallingcard.cpp in this regard, just allow it to use a callback along with the new support,
but still handle the actual name switching in LLAvatarNameCache.
Fixes a problem I was having with "[NAME] is Online" notifications appearing early on, only.
2012-12-05 01:48:09 -05:00
Shyotl
ef6f411b70
Removed LLUICtrl::setDoubleClickCallback and LLPanel::childSetDoubleClickCallback as they aren't used/needed and complicate things. Added LLPanel::childSetAction overload that accepts boost::singal2::signal (for boost::bind). Now using boost::function for various callbacks in LLScrollListCtrl (for boost::bind).
2012-12-04 21:54:01 -06:00
Lirusaito
2c48161595
Make Baker's Group code compile! Thanks Shyotl~
...
Note: Large groups still don't load?!
SimConsole cap is needed for Sim Console, won't work without it, keeping it in!
..But it should work with the new ASync one? Maybe needs tweaks, first?
Also switches opening IMs to the gCacheName->getFullName(id, name) system mentioned earlier, my connection has improved!
And makes the Avatar Picker show display names! Yay! (Rearranged the includes there, alphabetical~)
Also fallback to gCacheName->getFullName(id, name) if getting name fails in the new system.. hopefully this will combat occasional big failures.. but it may not work anyway.. maybe my connection is just awful again
2012-12-04 11:54:54 -05:00
Shyotl
ca3e0d2ba9
Use the correct font name. "SANSSERIF_SMALL", not "SANSSERIFSMALL"
2012-12-04 02:59:19 -06:00
Lirusaito
922e234fe9
Baker Linden's group update, added with some care, won't compile,
...
Note: These changesets removed the some caps in llviewerregion.cpp, I have made a note of these, but left them in.
Please take a look at the Singu Note:'s and Singu: TODO:'s when working on this.
2012-12-04 03:53:05 -05:00
Lirusaito
b9cfd2fae5
Replace the tricky copy-paste-everywhere Display Name system code with a unified function
...
Only does that, dun believe me? Take a look, oh... it also corrects improper interpretations of the PhoenixNameSystem value: 1 is both, 2 is displays, 0 and anything else is Legacy.
Also replaces a bit of the display name support code with new system... by definition this shouldn't change the log file, only the title of the session..
because of my bad connection during week days, I can not confirm this working 100%,
but if it does end up changing the logs under certain unseen conditions, replace the new name check with gCacheName->getFullName(id, name) but this reallllly shouldn't happen!
2012-12-04 00:36:12 -05:00
Aleric Inglewood
d8bc84adb1
Snapshot fixes and improvements.
...
* Allow to pass -1 to LLImageBase::reallocateData too (default parameter),
causing it to allocate what is necessary for the size set (same
behavior as allocateData).
* Speed up LLImageRaw::scale with factor 2 or 3 by copying the data less
often and calling LLImageBase::reallocateData instead of destroying
and recreating always.
* Fix gl_rect_2d to not decrement top and right with one pixel.
* Remove the vague "Constrain Proportions" checkbox and replace it with
a new combo box and spinner to explicitly set the target aspect ratio,
allowing to set it also to something different than either the window
aspect ratio (ie, 1.6) or the target image dimension (1.0 for textures)
which was totally lacking when, for example, uploading a profile image
(which needs to be 4:3). This also allows to show snapshots on prims
of arbitrary aspects.
2012-12-04 00:45:01 +01:00
Shyotl
ce3511f7ea
Misc changes via v3 merge. Nothing big.
2012-12-03 15:03:52 -06:00
Shyotl
a8e1bd1538
'Save scripts in inventory as Mono scripts instead of LSL2' checkbox was not functioning. For whatever reason it was not implemented in the actual panel, and referenced the incorrect setting. The proper setting will be 'SaveInventoryScriptsAsMono' not 'SaveScriptsAsMono'
2012-12-03 11:33:24 -06:00
Lirusaito
0876c8c2bf
Go away when idle checkbox added to General Preferences.
2012-12-02 22:14:36 -05:00
Shyotl
0554ecae5c
Added explicit texture reloading. Accessable in the 'tools' submenus for the agent, avatars, and selected objects.
2012-12-02 17:06:54 -06:00
Lirusaito
cfbc8a23f7
Transaction Notifications are now optionally Notify Tips for those who don't want them to collect at the top right of the screen, but still want a notification.
...
Debug setting LiruNoTransactionClutter has been added, and is toggled by checkbox in General preferences
This adds support for TransactionInfo message, to localize the server's transaction notifications.
Adds a notification called Payment, which unifies all three of v-d's Payment* notifications.
This is a fairly large change to view, keep in mind what was removed as it may just be in a slightly different order or position..
2012-12-02 17:52:36 -05:00
Drake Arconis
5e71d9578f
A bit of cleanup in preperation for VS2012
2012-11-30 11:17:10 -05:00
Shyotl
8b19f82c0b
Trivial changes. Resolved some sign mismatch warnings, and now using LLCachedControl for 'SGIgnoreSimulatorCameraConstraint' setting lookup.
2012-11-29 11:58:41 -06:00
Shyotl
794dbacea3
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit
...
Conflicts:
indra/newview/lldrawpoolavatar.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/llworldmap.cpp
indra/newview/pipeline.cpp
2012-11-29 11:54:41 -06:00
Shyotl
3a4b6cf6b6
Hovertext updates marked objects as 'moved' when inappropriate. http://hg.secondlife.com/viewer-development/commits/8ccf2b0fa3857a6610f6ea03166e5a4494ca6d03
2012-11-29 10:07:25 -06:00
Shyotl
c0c9c51e43
Some minor syntax grooming in LLNetMap::draw
2012-11-29 10:03:48 -06:00
Aleric Inglewood
e788ee5faf
Merge branch 'master' into llwebprofile
2012-11-28 18:50:31 +01:00
Aleric Inglewood
e17405d80a
Fixed snapping of rotation in the edge-on case
...
Patch by https://codereview.secondlife.com/users/cron.stardust/
Jira: https://jira.secondlife.com/browse/STORM-1919
2012-11-28 17:04:24 +01:00
Aleric Inglewood
de52eebe7a
Allow setting a custom size when uploading a texture.
2012-11-26 23:21:34 +01:00
Aleric Inglewood
d7069a2a66
Fix cancelling "Save" while "Keep open after save" is unchecked.
...
This causes a failure to save local file, or when clicking
Cancel in the file chooser, to keep the image and keep the
snapshot floater open so a retry to save the image can be
attempted.
2012-11-26 20:41:25 +01:00
Aleric Inglewood
7faa19b297
Large snapshot update (part 1)
...
This commit concentrates on remembering what parameters
where used for the last snapshot (the actual source, not
the formatted one), thus - the parameters passed to
rawSnapshot() - and then shows this snapshot as if it
was just made whenever the UI parameter selection matches.
The result is that the user can make a snapshot, save
it (for example) to their harddisk and then change the
destination and upload the same thing as snapshot.
The code tries hard to make this possible by automatically
adjusting the UI parameters to match every time the destination
is changed PROVIDED it was already saved or uploaded before.
If a snapshot wasn't saved and one changes destination
then this currently doesn't happen (by you could manually
make the parameters match, and still upload it). Also, if
the resolution is changed for a particular destination then
it won't automatically adjust it again.
Obviously, snapshots are no longer refreshed when changing
destination etc. You have to explicitly click "Refresh
Snapshot" before the last one is deleted / replaced.
The Debug Setting variables reflect the (last) manual choices
in most cases (set in the onCommit functions). If such a choice
is not allowed for a different destination then the UI is
changed to reflect the current behavior and the checkbox is
disabled so the user can't change it anymore. Then, if they
change destination back - the Debug Setting variable is used
to remember their last preference. A new Debug Setting has
been added for this purpose: SnapshotLayerType (colors or depth).
The old mSnapshotUpToDate has been removed and replaced with
mShowFreezeFrameSnapshot. The old getSnapshotUpToDate() now
returns something else (than mShowFreezeFrameSnapshot), namely
whether or not the current raw snapshot was taken with the same
parameters as are currently set in the UI.
The unused functions getImageAspect() and getAspect() were
removed.
mCurImageIndex has been deleted. Index 0 now means "the last
snapshot" and index 1 is temporarily used for the Falling Away
animation.
mDataSize was renamed to mFormattedDataSize.
The size spinner arrows are now disabled too whenever the spinner
edit field is disabled.
A bug in Freeze Time was fixed, where avatars would still
rotate around their axis in place (and without that their
attachments moved!)
Pressing ESC would return keyboard control to "walking"
for the own avatar with the above as result for the own
avatar. We now intercept ESC and use it (in Freeze Time mode)
to return to the cammable preview when a 2D preview was
being shown.
2012-11-26 18:12:41 +01:00
Shyotl
5e6ed2dc9f
Large update to the worldmap. Essentially, v3 merge, and reimplemented legacy tile drawing and opensim-specific changes. Also added a diagnostic view.
2012-11-24 11:21:29 -06:00
Shyotl
adebc36bc7
Cheap workaround for osgrid giving us an invalid pure-white single-channel opaque water texture. First it purges the texture from the cache and attempts to refetch, and if it's still invalid it falls back to the transparent water texture (which won't actually be transparent due to blending being disabled). Also fixed some annoying console spam related to null textures, and also now using the correct glTexGen* function. More details in comments.
2012-11-24 01:00:25 -06:00
Aleric Inglewood
165bebda3e
Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.
2012-11-23 03:19:39 +01:00
Aleric Inglewood
0f54e5fe46
Remove erroneous assertion.
2012-11-22 03:55:10 +01:00
Aleric Inglewood
14c046108e
Snapshot floater changes
...
* Added a radio button for "Post to my.secondlife.com feed"
* Moved the snapshot to the top of the floater.
* Increased the size of the snapshot to match the size used in V3
(floater is only 4 pixels wider though).
* Disable the "Temporary upload" checkbox when the Destination isn't the
inventory.
* Update the shown Upload Fee to L$ 0 if temporary is checked.
* Added a size chooser for the Feed destination, using exclusively
preset sizes with an aspect ratio of 4:3.
* Added two new preset sizes: 1024x1024 for texture uploads, and
1680x1050 for save to disk.
2012-11-20 22:27:48 +01:00
Aleric Inglewood
b5a8850d65
Fix deinitialization order fiasco.
2012-11-19 08:32:00 +01:00
Aleric Inglewood
3f51bb6e1d
Clear the command queue after flushing statemachines
...
Flushing the state machines can cause remove commands to be added to the
command queue, so clearing it needs to be after.
2012-11-19 08:31:46 +01:00
Siana Gearz
bf4100c024
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-11-19 05:10:16 +01:00
Aleric Inglewood
aab195a6eb
Fix deinitialization order fiasco.
2012-11-19 04:42:02 +01:00
Aleric Inglewood
2400d146ce
Clear the command queue after flushing statemachines
...
Flushing the state machines can cause remove commands to be added to the
command queue, so clearing it needs to be after.
2012-11-19 04:01:54 +01:00
Shyotl
9a9b5ce61e
LLRectBase<>::clipPointToRect could divide by zero, resulting in the resulting clampd values being invalid under some scenarios (worldmap panning could cause the mouse cursor to 'restore' to an invalid location upon mouseclick release.)
2012-11-18 02:48:55 -06:00
Shyotl
6b473c6edc
Avoid clearing hud object rebuild states when teleporting.
2012-11-18 02:42:33 -06:00
Shyotl
9d8f31a0cb
Some teleport reworking. Don't clear rebuild groups/resetVBO unless tp screen is up, or we've just changed sims. Also skip updateUI drawing if tp screen is up.
2012-11-18 02:41:37 -06:00
Aleric Inglewood
5947769812
Fix LLMimeDiscoveryResponder.
...
Extract Content-Type also from a 405 reply.
If all else fails, use a default mime-type for url's opened
in the browser (start with http: or https:) of "text/html" instead
of "none/none".
2012-11-18 03:29:01 +01:00
Aleric Inglewood
52673f5249
Slight update of README
2012-11-18 02:41:37 +01:00
Aleric Inglewood
f44de434c2
Always use followRedir() to determine if redirections should be followed.
...
Before every HEAD and GET request allowed redirection by default,
without setting a limit on the number of redirections. This caused
an infinite redirect loop when connecting to marketplace, in combination
with the bug that we did not allow cookies.
2012-11-18 02:07:19 +01:00
Siana Gearz
cbb27a5661
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-11-18 01:33:18 +01:00
Siana Gearz
48eaccc612
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-11-18 01:33:11 +01:00
Aleric Inglewood
5499136677
Don't send an Accept header for HEAD requests.
2012-11-18 01:29:24 +01:00
Aleric Inglewood
57b66a9be9
Allow cookies when allowing redirects (next to when sending a Cookie ourselves).
2012-11-18 01:28:23 +01:00
Aleric Inglewood
746f419e80
Fix detection of mIsInProductionGrid and fix getMarketplaceDomain()
...
getMarketplaceDomain() should return aditi.lindenlab.com for aditi,
not secondlife.aditi.lindenlab.com.
mIsInProductionGrid wasn't set correctly.
2012-11-17 21:38:55 +01:00
Aleric Inglewood
5d1a138c5c
Code clean up of code related to previous commit.
2012-11-17 05:16:21 +01:00
Aleric Inglewood
e781870da3
Fix Ratany Residents crash
2012-11-17 04:55:34 +01:00
Aleric Inglewood
e3f30fece9
Fix print_diagnostics for windows.
2012-11-16 16:06:30 +01:00
Lirusaito
7b2536eb0d
Inventory cut support!
...
Also fixes a bunch of comments, implementation based off of v-d.
Added isOnClipboard and setCutMode functions to LLInventoryClipboard, in part from v-d's LLClipboard.
LLInventoryFilter has a few rearrangements of code; only real change is now it has checkAgainstClipboard and uses it to filter out cut items.
There is a massive retabbed block in llinventorymodel.cpp, view without space changes. Implements removeObject.
Note: We are not afflicted by MAINT-1197: Fix inventory deselection/reselection when cutting items
2012-11-16 02:47:05 -05:00
Damian Zhaoying
299382b907
Add Merchant Outbox text files
2012-11-15 22:13:17 -03:00
Aleric Inglewood
fce64f8f12
Add LLWebProfile and responders.
...
Adds finding and using libjsoncpp. Note that the old cmake file
found libjson, not the same thing.
Adds Debug Setting WebProfileNonProductionURL (next to already existing
WebProfileURL) to mimic V3's behavior and use a different URL for aditi.
These Debug Settings are using by (the new) getProfileURL() (copied
from V3 with just a minor fix).
Adds HippoGridInfo::isInProductionGrid() next to the existing
LLViewerLogin::isInProductionGrid that always returned true.
The former should only be called SL grids and then only returns
true for agni (and false for aditi et al). The latter was changed
to now always return true except on SL when the grid isn't agni.
The first is used for SL-only cases, the latter for things like
colors and for godmode decision logic.
V3's llwebprofile.cpp was fixed to compile on singu, with only real
difference that I dropped the Content-Type headers for the GET methods.
2012-11-16 02:00:06 +01:00
Aleric Inglewood
f8bf11d574
More clearly state the implications of the NoVerifySSLCert debug option
2012-11-15 14:14:25 +01:00
Aleric Inglewood
fdfe0cae87
More clearly state the implications of the NoVerifySSLCert debug option
2012-11-15 13:51:16 +01:00
Aleric Inglewood
66664660d7
Copied llwebprofile.{h,cpp} from v-d as-is.
2012-11-15 04:07:44 +01:00
Scott Meitz
760ac98ab6
missed another spot with trailing spaces in aa functions, TNX LightDrake and Shyot1 :)
2012-11-14 21:37:36 -05:00
Scott Meitz
2bd5d88dbf
fix extra space in strings.xml en. Tooltip was not find them
2012-11-14 21:37:00 -05:00
Siana Gearz
5f78a36899
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-11-15 02:30:01 +01:00
Lirusaito
b897b9427f
Fix unclickable explanatory link on Outbox floater
...
mOutboxInventoryPanel couldn't be setVisible(false) while it was NULL, thus it sat on top of the rest of the UI.
Set it to panel_outbox_inventory in postBuild, instead of setupOutbox.
2012-11-14 16:48:03 -05:00
Lirusaito
c33b1004d1
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-11-14 13:55:48 -05:00
Siana Gearz
19e8977fff
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-11-14 19:40:45 +01:00
Aleric Inglewood
c097d650dc
Don't upload partial files
2012-11-14 19:26:16 +01:00
Aleric Inglewood
b7af32bee3
Use std::istream::read instead of readsome
...
According to the docs
(http://www.cplusplus.com/reference/iostream/istream/readsome/ )
readsome would also set state flag eofbit, but apparently I'm
misinterpreting it. Anyway, using read() and then gcount()
to get the number of bytes does work.
2012-11-14 18:37:44 +01:00
Shyotl
d2422b03be
Don't flush rebuild queue nor flush pending texture requests if merely performing a local teleport (eg: doubleclick teleporting within current sim.)
2012-11-13 23:34:48 -06:00
Shyotl
97d2085735
Nullcheck in LLTextureFetch::removeRequest was returning without unlocking LLTextureFetch::mQueueMutex if called via LLTextureFetch::deleteRequest
2012-11-13 23:25:32 -06:00
Aleric Inglewood
e307df79a1
Ignore the body in case of internal errors
2012-11-14 04:00:26 +01:00
Aleric Inglewood
324fe06a06
Improved printed info when curl times out.
2012-11-14 02:12:27 +01:00
Shyotl
fe15371047
Update to LLTombstone/LLHandle/LLRootHandle/LLHandleProvider.
2012-11-13 17:55:52 -06:00
Siana Gearz
fbb7196100
Missed a piece of a fix for the case we receive complete texture data instead of what we asked for.
...
The rest of the fix landed in commit c37a473287 by accident.
2012-11-13 23:54:23 +01:00
Siana Gearz
8c9a9c9d12
Introducing SGIgnoreSimulatorCameraConstraints
2012-11-13 23:46:21 +01:00
Aleric Inglewood
6f8ea87c46
Add ResponderHeadersOnly.
...
ResponderHeadersOnly is a base class for responders that use
HTTPClient::head or HTTPClient::getHeaderOnly. It already
has a needsHeaders() that return true and only allows for
completedHeaders to be overridden.
I removed the CURLOPT_HEADER option for these cases, because
that only causes the headers to be send to the writeCallback
as if they are part of the body, in addition to the headerCallback;
That gave raise to some confusion for the existing code (ie,
unexpected errors when trying to decode the body as LLSD and
duplicated 'low speed' information for the Timeout policy code.
2012-11-13 21:46:35 +01:00
Siana Gearz
3d84157325
Revert "Probably antivirus-friendlier SLPlugin"
...
This reverts commit 817085c172 .
2012-11-13 18:41:58 +01:00
Siana Gearz
9abf8ddf91
Merge git://github.com/Murf/SingularityViewer
2012-11-13 18:40:20 +01:00
Lirusaito
f289d5d9e7
Make MARKET_IMPORTER_UPDATE_FREQUENCY configurable as debug setting MarketImporterUpdateFreq
...
Change the default to a minute... that should be good? Right?
2012-11-13 00:16:04 -05:00
Lirusaito
821c03a389
Copy folders support!
...
Sync with v-d/rlva for Copy folder support
Also, guard against outboxy stuff, like when we're importing, don't show the Marketplace Send menu entry.
Fixed a few comments
Please view this commit with space/tab changes off! There were a lot of retabbing cases that don't need to waste anymore of anyone's time.
2012-11-13 00:06:47 -05:00
Siana Gearz
c37a473287
Add NickyD's fast j2k metadata reader
2012-11-13 05:38:27 +01:00
Shyotl
3eebedc4c3
Revert "Avoid re-requesting object-inventory items that already have a pending request."
...
This code was actually regression in viewer-dev and causes some issues.
This reverts commit cd5aa8f074 .
2012-11-12 20:32:40 -06:00
Siana Gearz
5eb99b7d2f
Attempt to fix frame timer on broken mainboards
2012-11-13 02:50:15 +01:00
Brett Murphy
3534706a59
get OSX building again
2012-11-13 11:38:28 +11:00
Brett Murphy
717a8a5cdb
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer
2012-11-13 11:03:38 +11:00
Aleric Inglewood
586d8fdf21
Compile fixes for gcc 4.2 (Mac)
2012-11-13 01:01:19 +01:00
Siana Gearz
f4016c2e1c
Stop trying to package dbghelp.dll - windows always comes with one anyway
2012-11-12 19:37:31 +01:00
Siana Gearz
2bb08d7638
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2012-11-12 19:34:06 +01:00
Aleric Inglewood
155cc56632
Do not put AICurlEasyRequest in a container.
2012-11-12 18:42:55 +01:00
Shyotl
4a4032f3b8
Hopefully allows better behavior when loading other avatars. This is from v3, and taking a cursory glance, it's useful as onFirstTEMessageReceived is called before LLVOAvatar::idleUpdate, which means that mLoadedCallbacksPaused hasn't been updated for that particualr frame yet. Using LLVOAvatar::isVisible() is more accurate.
2012-11-12 03:41:53 -06:00
Shyotl
cd5aa8f074
Avoid re-requesting object-inventory items that already have a pending request.
2012-11-12 03:18:02 -06:00
Shyotl
c2b26f6c15
GCC Fixes:
...
Only use C++0x/C++11 features if compiling for windows, or if GCC is configured to support such features (v4.7 onwards: '-std=c++11'. v4.3 through v4.6: '-std=c++0x')
Removed an assertion that's no longer possible to evaluate (queue doesn't support iterators).
2012-11-12 03:04:24 -06:00
Shyotl
f25ca2ac80
Fixed small #if/#ifdef typo. Also fixed formatting error in strings.xml
2012-11-12 00:12:39 -06:00
Siana Gearz
303c74f4c9
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
...
Conflicts:
indra/llmessage/llurlrequest.cpp
indra/newview/llvoavatar.cpp
2012-11-12 06:46:58 +01:00
Siana Gearz
59d4d833f1
Made octree check optional
2012-11-12 04:48:00 +01:00
Siana Gearz
562acd6e2c
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-11-12 04:12:57 +01:00
Siana Gearz
c3d76669ca
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/llmessage/llavatarnamecache.cpp
2012-11-12 04:12:28 +01:00
Siana Gearz
14d8d14832
Texture fetch cleanup
2012-11-12 03:33:17 +01:00
Aleric Inglewood
cdc04ba413
Merge branch 'fasttimelock'
2012-11-11 19:06:14 +01:00
Aleric Inglewood
ab91525e7a
Add missing needHeaders
...
The AIBufferedCurlEasyRequestEvents are not triggered unless
the derived class return true for needsHeaders().
That means, every class that implements received_HTTP_header(),
received_header() or completed_headers(), or implement
the virtual function completedHeaders(), or use the protected
member mReceivedHeaders directly.
This commits adds missing needsHeaders() for LLAvatarNameCache
(thanks Siana) and XMLRPCResponder. The former now uses
mReceivedHeaders directly instead of making a copy.
2012-11-11 17:36:43 +01:00
Shyotl
0a4b3487ea
Resolve string substitutions failing for a few 'unsuccessful' startup dialogs.
2012-11-11 01:01:04 -06:00
Aleric Inglewood
0061055e73
Attempted to dereference a past-the-end iterator.
2012-11-11 01:54:50 +01:00
Aleric Inglewood
a16c4015ba
Attempted to decrement past-the-end iterator of empty container.
2012-11-11 01:54:50 +01:00
Shyotl
0173c29630
Resolve compiler warning caused by silly temporary #define.
2012-11-09 23:32:57 -06:00
Aleric Inglewood
26a734a538
Add fasttimers around obtaining a mutex or waiting on a condition.
2012-11-10 02:33:48 +01:00
Aleric Inglewood
04e7dc1270
Collect and print stats about HTTP status code
2012-11-10 02:19:20 +01:00
Shyotl
1cdc11dae2
Added LLTextureFetch::deleteAllRequests procedure. Called upon teleport.
2012-11-09 18:45:57 -06:00
Shyotl
1cb75c4471
Tiny bit of code consolidation in lltexturefetch
2012-11-09 18:42:37 -06:00
Shyotl
b6efc9f583
Fixed buggyness regarding objects moved by scripts. http://hg.secondlife.com/viewer-development/changeset/1a874cd5d0a0616b979a571e810320cd35e69baf
2012-11-09 18:41:05 -06:00
Shyotl
01868e46fe
Removed pointless redundant gGL.flush() calls from llworldmapview.
2012-11-09 18:33:44 -06:00
Shyotl
313cce23db
Trivial. Changed LLOcclusionQueryPool::mAvailableName to std::queue, because it's being used as a queue, and it being a list makes little sense.
2012-11-09 18:32:57 -06:00
Shyotl
9aca1f41f3
Make occlusion boundingbox 'fudge' settings adjustable via SHOcclusionFudge saved setting.
2012-11-09 18:20:45 -06:00
Shyotl
81c7445744
image->hasFetcher() check reundant in LLViewerTextureList::clearFetchingRequests(). LLViewerFetchedTexture::forceToDeleteRequest() checks for this too.
2012-11-09 18:12:57 -06:00
Shyotl
d54daa19a0
Allow trial of trasform feedback (for testing/benchmark) on hardware that declares support for GL_EXT_transform_feedback. Performance is far less than satisfactory on my hd4870(ogl3.3 gpu), however. Also messes up texcoords. Don't add RenderUseTransformFeedback to settings.xml.
2012-11-09 18:10:39 -06:00
Shyotl
0c58a42b08
Added a couple needed nullchecks of gAgentAvatarp in LLAgent.
2012-11-09 16:32:26 -06:00
Aleric Inglewood
68cbf31c8b
Add a PerHostRequestQueue object.
...
Adds a std::map for hostname (or urls) --> PerHostRequestQueue
objects. The latter keeps track of the number of added curl easy
requests and decides if a new request should be throttled or
not, as well as provides the queue to queue throttled requests.
At the moment CurlConcurrentConnectionsPerHost is set to 16,
because things really don't work without LL supporting connection
reuse if we limit it to 2. CurlConcurrentConnectionsPerHost is
also set to non-persistent so that we can easily change it in the future
(once we decide on it's final value it can be set to persistent).
2012-11-07 15:41:50 +01:00
Lirusaito
d518222340
Disable Group Fee Invites in antispam preferences, when appropriate.
2012-11-06 21:35:35 -05:00
Lirusaito
7a35a43bd4
Merchant Outbox!
...
Enter: LLFloaterOutbox, floater_merchant_outbox, LLMarketplaceFunctions, LLPanelMarketplaceOutboxInventory, and panel_outbox_inventory
LLView now has childFromPoint() from v-d.
LLInventoryBridge{
Sync includes with v-d.
Let's ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU for ease of access and tweak it to work.
Uncomment related code.
Catch if we're moving objects into the outbox during pasteFromClipboard()
}
LLInventoryPanel: start_folder attribute for inventory_panels, this could be quite useful in the future
Sync LLToolDragAndDrop with Catznip/v-d
Add the outbox to the World menu, since that seems to involve most commerce. Perhaps we should add a menu entry to the outbox itself to open its floater?
Fix the inventory merchant menu entries, thanks Shyotl..
Merchant Outbox Strings!
2012-11-06 20:23:36 -05:00
Aleric Inglewood
cb52e82a60
Moved and extended AICurlInterface::Stats
...
Moved AICurlPrivate::Stats to AICurlInterface::Stats and added several
counters to keep track of the number of existing instances of
respectively AICurlEasyRequest, AICurlEasyRequestStateMachine,
BufferedCurlEasyRequest, ResponderBase and
ThreadSafeBufferedCurlEasyRequest.
2012-11-07 02:15:23 +01:00
Aleric Inglewood
1a43bc8abf
As AIStateMachine moved outside newview, there is no longer any need to pass AIStateMachine::flush to initCurl()
2012-11-07 02:08:52 +01:00
Aleric Inglewood
e88c39b090
AIStateMachine::flush can only make statemachines idle.
...
As idle statemachines aren't in any list, it's not possible
(without adding that list) to delete them. I don't think
that there are any active statemachines left at the end
of flush anyway, but killing them doesn't much sense if
we can't get them all: there will always be statemachines
left: those that were idle at the moment the viewer was
quit.
2012-11-07 01:53:12 +01:00
Aleric Inglewood
a1f5e6ba43
Rename AICurlResponderBufferEvents to AIBufferedCurlEasyRequestEvents
...
Since we changed CurlResponderBuffer to be derived from CurlEasyRequest
and therefore changed it's name to BufferedCurlEasyRequest, we should
also rename AICurlResponderBufferEvents to
AIBufferedCurlEasyRequestEvents.
This commit also fixes C++ comment in several places to reflex the
previous name change.
2012-11-07 01:49:45 +01:00
Lirusaito
d0a0aa7a65
Fix handle_secondlifeprotocol.sh, and sync with v-d.
...
More translation strings~
Log inventory offers to those we're not chatting with.
"SDL deiconification state switched to " now lldebugs instead of llinfos, far too spammy..
(Pre-outbox commit, may contain pieces of outbox work.. and unmentioned harmless sync)
2012-11-06 18:50:45 -05:00
Drake Arconis
8cf956e669
Fixed a crash
2012-11-06 07:20:24 -05:00
Shyotl
3bbb23b1bc
Experiments with allocating octree nodes via memory pools.
2012-11-05 16:58:03 -06:00
Shyotl
a582b5996c
Whoops. Forgot settings.xml
2012-11-05 14:54:48 -06:00
Siana Gearz
4cd10c34e2
Fix manifest when extra libs are empty on Windows
2012-11-05 12:15:42 +01:00
Shyotl
3ec1dbf51c
Updated spatial partition and octrees to use std::vector. Also, added diagnostic spew to octrees.
2012-11-04 21:48:17 -06:00
Shyotl
71deb8925e
Added some nullchecks, removed some dead code, and cleaned up a few small things.
2012-11-04 21:16:53 -06:00
Siana Gearz
abb562d1ab
For extra safety
2012-11-05 03:22:57 +01:00
Aleric Inglewood
a495a6bfbc
Short circuit llsd debug check.
2012-11-05 01:04:02 +01:00
Siana Gearz
e86b17be2d
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-11-04 18:56:15 +01:00
Aleric Inglewood
e62f805bcd
Fix wrong assertion mAddedEasyRequests.size() >= (size_t)mRunningHandles
...
Rename check_run_count to check_msg_queue, because the whole 'run count'
approach is flawed anyway (the author of libcurl told me that THE way
to check for finished curl handles is to just call curl_multi_info_read
every time: it's extremely fast. Any test that attempts to avoid that
call is nonsense anyway.
The reason the assertion failed might have been caused by the fact
that we're comparing the current number of easy handles with the
number of running handles of 'a while ago'. It is possible that a
easy handle was removed in the meantime.
In order to check if that hypothesis is right, I moved the assertion
to directly below the call to curl_multi_socket_action where it
should hold. If this new assertion doesn't trigger than the hypothesis
was right and this is fixed.
2012-11-04 17:08:05 +01:00
Siana Gearz
6f8ae718d1
Forgotten files for message logger
2012-11-04 03:30:49 +01:00
Siana Gearz
1dcfa9e0ee
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/llmessage/llregionpresenceverifier.cpp
indra/llmessage/llregionpresenceverifier.h
2012-11-04 02:10:31 +01:00
Siana Gearz
7f0664ff82
Bringing back message logger
2012-11-03 14:13:13 +01:00
Aleric Inglewood
03b3e60e23
Merge branch 'curlthreading3'
2012-11-02 18:54:07 +01:00
Aleric Inglewood
72bde5234a
Rename CurlResponderBuffer to BufferedCurlEasyRequest and derive it from CurlEasyRequest
...
Every curl transaction is a AICurlEasyRequestStateMachine which has a
AICurlEasyRequest as member, which is a reference counting pointer to
a ThreadSafeBufferedCurlEasyRequest. And now BufferedCurlEasyRequest is
derived from CurlEasyRequest which is derived from CurlEasyHandle, but
neither are used separatedly.
2012-11-02 18:41:23 +01:00
Aleric Inglewood
1e1f5e8193
Fix windows compile errors/warnings
2012-11-01 03:18:00 +01:00
Aleric Inglewood
6c01b6da9b
Merging CurlEasyRequest and CurlResponderBuffer, Step 1
2012-11-01 02:40:08 +01:00
Aleric Inglewood
756aac1f9a
Remove AICurlInterface::strerror
2012-11-01 02:04:40 +01:00
Aleric Inglewood
c0ac428179
Code cleanup
...
* Moved Responder stuff to LLHTTPClient.
* Renamed LLHTTPClient::Responder to LLHTTPClient::ResponderWithResult.
* Deleted LLHTTPClientAdapter and LLHTTPClientInterface.
* Renamed AICurlInterface::TransferInfo to AITransferInfo and moved it
to llhttpclient.h
* Removed 'CURLcode code' argument from completed_headers.
2012-10-31 23:11:42 +01:00
Aleric Inglewood
7549b471c3
Moved curl stuff from indra/aistatemachine to indra/llmessage.
2012-10-31 18:51:52 +01:00
Aleric Inglewood
0b265320a9
Code clean up.
...
* Removed LLCurlRequest and replaced it's last usage with LLHTTPClient API calls.
* Deleted dead code.
* Renamed all the get4/post4/put4/getByteRange4 etc, back to their
original name without the '4'.
2012-10-31 05:01:24 +01:00
Aleric Inglewood
6033a76870
Print more debug output. Remove last AIFIXME
2012-10-30 21:37:49 +01:00
Aleric Inglewood
3708d55ef9
Allow changing CurlTimeout Debug Settings on the fly.
...
Same for NoVerifySSLCert and CurlConcurrentConnections.
2012-10-30 21:18:15 +01:00
Aleric Inglewood
9996cf6157
Bug fix
2012-10-30 21:17:25 +01:00
Aleric Inglewood
3e78b7c262
Allow people with last name "Resident" to login using Hippogrid manager.
2012-10-30 07:16:01 +01:00
Aleric Inglewood
65e012c540
More curl fixes and changes.
...
* Moved LegacyPolledResponder::mCode to ResponderBase::mCode.
* Added a parameter to ResponderBase::finished (and pubError*) to set mCode.
* Renamed ResponderBase::decode_body to decode_llsd_body and added ResponderBase::decode_raw_body.
* Use LegacyPolledResponder::finished instead of LegacyPolledResponder::completed_headers
to set remaining cached values.
* Fixed assertion in case of -DCWDEBUG and upload finish detection failure in case of HEAD
method (mDebugIsGetMethod -> mDebugIsHeadOrGetMethod).
* Add XmlTreeInjector : support for LLXmlTree.
* Split BlockingResponder into BlockingLLSDResponder and BlockingRawResponder.
* Final blocking responders are now: BlockingLLSDPostResponder, BlockingLLSDGetResponder
and BlockingRawGetResponder.
* Added LLHTTPClient::blockingGetRaw
* Got rid of hipporestrequest.* -- and fixed hippogridmanager.cpp to use
LLHTTPClient::blockingGetRaw instead, and fixed llviewermessage.cpp to use
AICurlInterface::ResponderWithCompleted and decode_raw_body instead of
HippoRestHandlerRaw and LLHTTPClient::get4 instead of HippoRestRequest::get5.
2012-10-28 17:38:25 +01:00
Aleric Inglewood
2a88f7d7c4
ResponderAdapter stuff
...
Renamed AICurlInterface::Responder to AICurlInterface::ResponderBase,
but without the virtual 'event' methods.
Derived from that: Responder and ReponderWithCompleted, where the
first defines result = 0, ErrorWithContent and error, and the latter
completedRaw and completed.
Added HttpClient::IgnoreBody, derived from Responder and implementing
'result' doing nothing; HttpClient::Ignore is now derived from
IgnoreBody and defines the still pure virtual getHTTPTimeoutPolicy.
Added ResponderBase::decode_body, which is now the sole place
where the code makes the decision wether some response data might be
LLSD or not based on the http status result. Before it just tried
to decode everything as LLSD, which seems a bit nonsense.
ResponderWithCompleted::completed no longer does anything, since
classes derived from ResponderWithCompleted are expected to override it,
or never call it by overriding completedRaw.
Entry point is now ResponderBase::finished = 0, instead of
completedRaw, where ResponderWithCompleted implements finished by
called completedRaw, but Responder doesn't: that directly calls
result/errorWithContent/error. Or, for the hack ResponderAdapter,
the entry points are pubResult/pubErrorWithContent.
Those are now the ONLY public methods, so more confusion.
mFinished is now set in all cases.
As a result of all that, it is no longer possible to accidently
pass a responder to ResponderAdapter that would break because it
expects completed() and completedRaw() to be called.
Added LLBufferArray::writeChannelTo.
Fixed bug for BlockingResponder::body (returned reference to temporary).
LLSDMessage::ResponderAdapter now allows a "timeoutpolicy" name
to be passed (not doing so results in the default timings), so
that the timeout policy of the used responder is retained.
Fixed llfasttimerview.cpp to test LLSDSerialize::fromXML() to return
a positive value instead of non-zero, because it may return -1 when the
parsing fails (three places).
Removed LLHTTPClient::Responder as base class from
LLFloaterRegionDebugConsole completely: it isn't a responder!
Several other responder classes were simplified a bit in order to
compile again with the above changes.
2012-10-26 04:13:29 +02:00
Shyotl
dca9501de7
Attempt to break viewer window out of 'maximized' mode when not actually maximized. There are old jiras about the previous workaround causing issues, so let's attempt a different method.
2012-10-25 20:52:14 -05:00
Shyotl
8ed6b549ee
A few resolutions in the dropdown in the prefrences panel were not being parsed correctly. Use standard 'x' instead of '×'
2012-10-25 20:50:42 -05:00
Shyotl
1a741b97d2
Fixed LLGLState::checkStates() failing upon context re-creation:
...
-After new context creation, immediately call LLRender::refreshState() after LLViewerWindow::initGLDefaults() in order to force states to apply.
--LLRender::initGLDefaults optimizes out gl calls by caching states, but the cached values are only applicable to the old context, not the new, so this optimization must be skipped (LLRender::mDirty).
-LLViewerWindow::mStatesDirty also triggered a redundant shader reload, since restoreGL also called setShaders().
Fixed somewhat annoying flicker of a single frame whilst recovering from screen resizing.
-Skip frame if LLViewerWindow::checkSettings() called LLViewerWindow::reshape. (reshape will set gWindowResized to true)
--True optimal fix will require some refactoring.
Reworked how window position is saved in LLViewerWindow::changeDisplaySettings. Hopefully reduces chances of odd behavior (had WindowX and WindowY get stuck at massive negative values before)
2012-10-25 20:42:58 -05:00
Aleric Inglewood
33809f56c5
Comment out unused code.
2012-10-25 02:17:40 +02:00
Shyotl
67ee544231
Clear saved raw discard level upon texfetch cleanup. (missed this in an earlier commit)
2012-10-24 03:21:51 -05:00
Shyotl
94f61ce307
A few nullchecks in the particle system. Had a null drawable pop up.
2012-10-24 03:20:32 -05:00
Shyotl
b57f7cdc79
Fixed various specular/glow effects bleeding through fullbright objects in deferred.
2012-10-24 03:19:53 -05:00
Shyotl
c901a7136f
I freaking swear LL breaks hud attachment lighting in some way every few months. *Grumble*
2012-10-23 17:24:08 -05:00
Aleric Inglewood
243db9a3a8
Moved mFinished/is_finished() from LegacyPolledResponder to Responder.
...
Slightly more robust, adds one boolean to all responders, 99%
of which don't need that though, and an extra call redirection,
but well... We might need it this way when I add the possibility
to abort a transfer.
2012-10-22 22:52:18 +02:00
Shyotl
a5ef61ac82
Avoid std::vector::erase in particle system (erase in any sequence-independent vector is a waste as it shifts all elements to maintain element-ordering and contiguity). Replaced with swap and pop.
2012-10-22 15:46:12 -05:00
Shyotl
9e272aeef0
Still need to initialize flexis upon their very first idle update, else you get an ugly polygon soup when they first appear.
2012-10-22 15:32:33 -05:00
Shyotl
5c45979783
Resolve issue with sculpties loading with incorrect discard levels.
2012-10-22 15:26:53 -05:00
Shyotl
02f214d8a7
Clear object rebuild queues upon teleport.
2012-10-22 15:25:02 -05:00
Aleric Inglewood
daac25c343
Bug fix, introduced in commit 0bee4a92
2012-10-22 20:31:33 +02:00
Aleric Inglewood
768f1b5710
Fixes blocking_request. Adds LegacyPolledResponder and BlockingResponder.
...
XMLRPCResponder also uses the new LegacyPolledResponder now.
Renamed http_result() -> http_status().
2012-10-22 20:19:44 +02:00
Shyotl
5b4b9fd169
Durr, missed a line when adding attached light muting. Clobbered when diffing. Incrementing in a for loop is kinda important! Our handling in this function differes from LL in the firstplace because they are performing iteration on an iterator that can be invalid after the erase.
2012-10-22 03:17:33 -05:00
Shyotl
7dea357f4c
Picked up a few small changes from viewer-beta pertaining to pathfinding.
2012-10-22 03:08:51 -05:00
Shyotl
9ef10b1663
Muting an avatar now also removes their attached lights. Also cleaned up light update code(no change in behavior)
2012-10-22 03:07:07 -05:00
Shyotl
d2004e88f9
MatrixMode sanity checks and adjustments to physics debug display (fixes a crash with that debug view, too)
2012-10-22 03:05:18 -05:00
Shyotl
ef27cc54dd
Fixed unsafe erasure from vector while iterating in llinventorybackup.cpp.
2012-10-22 02:56:41 -05:00
Shyotl
19390eaec3
Remove pointless framebuffer status check. glReadBuffer doesn't work with gl_depth_attachment, thus will always complain about readbuffer being absent. (it checks GL_COLOR_ATTACHMENT0, which isn't present because this check is before we attach color attachments.)
2012-10-22 02:55:21 -05:00
Shyotl
dff6171605
More alignment crap.
2012-10-22 02:51:41 -05:00
Shyotl
4fe84efafd
Unbork shadow shaders by tweaking normal unpack.
2012-10-22 02:51:28 -05:00
Shyotl
ed4997168b
LLViewerObject::idleUpdate now returns void. Texture animations/flexis now have their own update queues.
2012-10-22 02:50:04 -05:00
Aleric Inglewood
b92de9beb5
Done as part of AIHTTPTimeout
2012-10-22 02:20:20 +02:00
Aleric Inglewood
7f50b2ba7b
Add XMLRPC support to LLHTTPClient and that instead of LLXMLRPCTransaction
2012-10-22 01:59:17 +02:00
Aleric Inglewood
c35bc71334
Fix crash when libcurl calls read callback before calling socket callback.
...
In days of usage this has never happened before, but apparently
it's possible. The solution chosen is to create the AIHTTPTimeout
object on the fly when it doesn't exist and let it be picked up
later when the CurlSocketInfo for the transfer is created.
2012-10-22 00:53:54 +02:00
Shyotl
413a8111c0
PASS_INVISI_SHINY never issued. Commented out some unused code.
2012-10-21 17:16:22 -05:00
Shyotl
5be31898f1
Don't compile avatar eye shader, as it isn't used anywhere.
2012-10-21 17:14:29 -05:00
Shyotl
44faf3e169
Removed annoying attribute consumption warnings. Alpha pass was leaving shader bound, which hosed up updateCull for water reflections (updateCull only binds occlusion shader if another shader isn't currently bound)
2012-10-21 17:14:00 -05:00
Aleric Inglewood
937a60c8f9
Add AIHTTPReceivedHeaders
...
This fixes the problem that existed with received headers:
The server sends some headers ("set-cookie") more than once
in the same reply, which cannot be stored in std::map.
The old code just ignored the additional cookies, while
curlthreading3 (since the introduction of AIHTTPHeaders)
caused an assertion.
AIHTTPReceivedHeaders is written around a std::multimap
and allows to retrieve multiple headers with the same key.
Also, it is case insensitive so that if a server sends
"Content-Type" it will still find it (the viewer looks for
"content-type").
2012-10-21 17:45:46 +02:00
Aleric Inglewood
f7626699da
Bug fix: (correctly) revoke CurlResponderBuffer events.
2012-10-21 17:28:22 +02:00
Lirusaito
ad97c72821
Use smaller horizontal chat tabs, where possible.
2012-10-21 11:19:03 -04:00
Lirusaito
b7ce7b7dab
Tiny LLWorld silliness fix up
2012-10-21 11:18:49 -04:00
Shyotl
b73f4dd8e4
Catch up with viewer-beta. Primarily sim transition alterations to reduce frame hitching, and some optimization in LLViewerObjectList (std::set -> std::vector and and some allocation tweakage).
2012-10-20 17:02:43 -05:00
Aleric Inglewood
a4bf92dae4
Add CURLcode and TransferInfo to completed_headers event.
2012-10-20 23:56:19 +02:00
Aleric Inglewood
1e745ba48b
Curl work in progress.
...
Minor changes like comment fixes and addition of accessors
that will be needed for future commits.
Also removed Responder::fatalError as it was never used.
2012-10-20 23:52:34 +02:00
Aleric Inglewood
f8273e977e
Make NoVerifySSLCert work for all LLURLRequest
...
Moved CURLOPT_ENCODING from CurlEasyRequest::setPost_raw, and
CURLOPT_SSL_VERIFYPEER and CURLOPT_SSL_VERIFYHOST from
CurlResponderBuffer::prepRequest, to LLURLRequest::configure,
enabling the debug setting NoVerifySSLCert for the latter
two to work as follows: old behavior if "NoVerifySSLCert"
is not set, and check neither if it is set. However, if
the (new) bool mIsAuth is set the behavior of LLXMLRPCTransaction::Impl::init
is used. This is so in a next commit we can replace
LLXMLRPCTransaction with LLURLRequest: LLXMLRPCTransaction::Impl::init
will be removed. For the same reason, when the new boolean
mNoCompression is set then CURLOPT_ENCODING is set to "identity",
otherwise the old behavior (of clearing it) is used.
2012-10-20 23:28:33 +02:00
Aleric Inglewood
605843b527
HTTP status of 400 is an error too.
2012-10-20 21:47:31 +02:00
Siana Gearz
71d2bd83aa
Fix inconsistent link/unlink checking
2012-10-17 13:41:30 +02:00
Siana Gearz
a12704c6a3
Don't eat my mouse when i might be debugging
2012-10-17 13:39:54 +02:00
Shyotl
43271f290e
A few more alignment bits and bobs.
2012-10-16 20:07:04 -05:00
Shyotl
7533b475be
TCMalloc can now be manually disabled via develop.py -DDISABLE_TCMALLOC:BOOL=ON
2012-10-16 17:15:23 -05:00
Shyotl
1b89e5c973
Dragged in a bunch of alignment fixes from LL. Should allow disabling of tcmalloc on windows/linux32 if such is ever implemented.
2012-10-16 02:33:05 -05:00
Aleric Inglewood
8ba127d4c5
HTTPTimeout work in progress
...
* Avoid using CurlEasyRequest::mTimeout for HTTPTime::done and
HTTPTime::print_diagnostics when it might be NULL.
* Comment fixes.
* Indentation fix.
2012-10-15 21:07:17 +02:00
Aleric Inglewood
bb8ea493d6
Fix top check in MultiHandle::check_run_count.
...
This check isn't really needed at all, since curl_multi_info_read
is fast enough, but well... The old check was flawed anyway.
2012-10-15 21:03:08 +02:00
Aleric Inglewood
02cffa9a71
Replace TimeOut with Timeout everywhere.
2012-10-15 21:01:16 +02:00
Aleric Inglewood
76fc30e460
HTTPTimeout work in progress.
...
* Moved DoutCurlEasy and DoutCurlEasyEntering from aicurl.cpp
to aicurl.h and renamed them to DoutCurl and DoutCurlEntering
respectively.
* Moved the callback functions from aicurl.cpp to aicurlthread.cpp.
* In CurlEasyRequest, renamed timeout_timings to print_curl_timings
and mTimeoutLowercaseHostname to mLowercaseHostname.
* Put all remaining CurlEasyRequest::mTimeout* variables and
timeout_* methods in curlthread::HTTPTimeout, stripping them
of said prefix, and moved the definition to aicurlprivate.h.
Added a ThreadSafeCurlEasyRequest* member and a get_lockobj()
method so to that class so we can still use DoutCurl /
DoutCurlEntering. timeout_add_easy_request was removed completely
and reimplemented as the constructor of HTTPTimeout.
timeout_has_stalled was renamed to HTTPTimeout::has_stalled,
but also reimplemented as CurlEasyRequest::has_stalled.
* CurlEasyRequest::mRequestFinalized was removed and it's
functionality taken over by CurlEasyRequest::mTimeoutPolicy.
* Fixed the indentation of struct Stats, class CurlEasyHandle
and class CurlEasyRequest.
* Added CurlEasyRequest::set_timeout_opts
* Added CurlSocketInfo::mTimeout (LLPointer<HTTPTimeout>).
* mUploadFinished is now reset in HTTPTimeout::data_received,
this was needed because "HEAD /something" header-only
messages triggered upload_finished (unlike "GET ..."),
and in combination with redirection that caused an assert.
2012-10-15 03:34:32 +02:00
Shyotl
e8ec81bf04
Experimentation with normalpacking and component precision.
2012-10-14 04:00:02 -05:00
Aleric Inglewood
9fba54ad5d
On failed transfer, print CURLINFO_OS_ERRNO when available.
2012-10-14 03:13:32 +02:00
Aleric Inglewood
ccd98c3c3d
Fix comment.
2012-10-14 02:55:45 +02:00
Aleric Inglewood
2539e41e59
Avoid problems in case a host also resolves to IPv6
2012-10-14 02:53:36 +02:00
Aleric Inglewood
83312fbb74
Allow getinfo() to be called on a const CurlEasyRequest.
2012-10-14 02:45:58 +02:00
Aleric Inglewood
6134162f1c
Merge remote-tracking branch 'singu/exp'
2012-10-14 00:57:07 +02:00
Lirusaito
fb713226a0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-10-12 13:50:56 -04:00
Aleric Inglewood
3ac46f5fa7
HTTP timeout work in progress.
2012-10-12 19:39:11 +02:00
Lirusaito
d5c507ca6b
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2012-10-12 12:59:42 -04:00
Drake Arconis
858bb15a6b
Fixed issue
2012-10-12 12:36:31 -04:00
Aleric Inglewood
faee255730
HTTP timeout bug fix! Plus work in progress.
...
Use the better understandable alias CURLOPT_HTTPHEADER in debug output
Bug fix - finally!
This fixes a bug I've been looking for a week.
By accidently calling get_clock_count() for the mTimeoutLowSpeedClock
'event', the time difference 'now' - 'event' becomes negative, which
should be impossible; the result being that timeout_low_speed
stalled for 24 seconds while looping over the full 32 bit. That in
turn made SSL handshakes of libcurl fail, which seemed to be
impossible since the calls to libcurl had not changed!
2012-10-12 04:50:46 +02:00
Shyotl
eb5b1312bb
Removed pointless asset fetches for expression-based gestures (opposed to animation based ones), since they don't have actual animation assets.
2012-10-11 02:40:00 -05:00
Siana Gearz
5445b4f97a
Fix bandwidth estimation for texture fetch
2012-10-10 15:37:43 +02:00
Aleric Inglewood
02ead94848
HTTP timeout work in progress.
...
More debug output.
Avoid the new assert when exiting the viewer.
2012-10-08 19:14:22 +02:00
Aleric Inglewood
6a4f76a219
Bug fix for previous commit.
2012-10-08 05:00:11 +02:00
Aleric Inglewood
1252b0bde2
HTTP timeout work in progress.
...
* Remove progress meter call back, use read/write/header callbacks instead.
* Don't use timeout_lowspeed for ReplyDelay, instead use:
* Add timeout stuff to the main loop (CurlEasyRequest::mTimeoutStalled).
This patch fixes a few things compared to the previous version.
More things need to be fixed.
2012-10-08 02:19:32 +02:00
Aleric Inglewood
a40fbf0da1
Cache hostname of url in CurlEasyRequest::mTimeoutLowercaseHostname
...
Also add DoutCurlEasyEntering debug macro.
The caching is necessary because CURLINFO_EFFECTIVE_URL is unreliable
and can change several times during the transfer at any moment (as
a result of forwarding etc).
2012-10-06 01:21:33 +02:00
Aleric Inglewood
468f52a4f6
Merge branch 'master' into curlthreading3
2012-10-05 16:55:28 +02:00
Aleric Inglewood
3f1fb9a66e
Add improved timeout handling for HTTP transactions.
...
Introduces AIHTTPTimeoutPolicy objects which do not just
specify a single "timeout" in seconds, but a plethora of
timings related to the life cycle of the average HTTP
transaction.
This knowledge is that moved to the Responder being
used instead of floating constants hardcoded in the
callers of http requests. This assumes that the same
timeout policy is wanted for each transaction that
uses the same Responder, which can be enforced is needed.
I added a AIHTTPTimeoutPolicy for EVERY responder,
only to make it easier later to tune timeout values
and/or to get feedback about which responder runs
into HTTP errors in debug output (especially time outs),
so that they can be tuned later. If we already understood
exactly what we were doing then most responders could
have been left alone and just return the default timeout
policy: by far most timeout policies are just a copy
of the default policy, currently.
This commit is not finished... It's a work in progress
(viewer runs fine with it though).
2012-10-05 15:53:29 +02:00
Drake Arconis
c181891549
New windlight presets
2012-10-04 18:28:51 -04:00
Drake Arconis
f84f4aa058
Updated/Fixed Cursors
2012-10-04 18:13:48 -04:00
Drake Arconis
5d5c3e2a48
LLCalcparser update
2012-10-04 17:56:43 -04:00
Drake Arconis
5b8b88e05a
Nuked ancient uneeded things
2012-10-04 17:56:25 -04:00
Drake Arconis
0287e21c01
More python indentation fixing...DIE TABS DIE
2012-10-04 16:34:10 -04:00
Drake Arconis
7d2f2bd610
Fixed python indentation in newview
2012-10-04 16:25:44 -04:00
Drake Arconis
d56393b134
Merge remote-tracking branch 'singu/master'
...
Conflicts:
indra/cmake/WebKitLibPlugin.cmake
indra/llmessage/llurlrequest.cpp
indra/plugins/webkit/media_plugin_webkit.cpp
2012-10-04 16:17:41 -04:00
Lirusaito
1f7ed035d3
Make translation more flexible
...
Also in this commit, unrelated updates to the building panel (so git sees the markup "just" move in my next commit)
2012-09-29 16:59:17 -04:00
Aleric Inglewood
8430328043
Add support for uploading JP2 files.
...
Recognizes .jp2, .j2c and .j2k extensions.
Adds image/jp2 files to file picker image filter (windows and Mac,
windows apparently already showed them).
Show preview for jpeg 2000 files.
Fixes error reporting for failed image uploads.
Enforces a power-of-two size for jpeg 2000 files (seemed to make sense to do that).
2012-09-29 17:47:15 +02:00
Lirusaito
f311852e9b
Satiate Issue 474 by showing a more sensible number for ARC by default.
...
http://code.google.com/p/singularity-viewer/issues/detail?id=474
Adds LiruSensibleARC debug setting, defaults to true.
Code ported from Imprudence.
2012-09-28 20:13:38 -04:00
Shyotl
ac0a32e690
Add an antispam setting to block only group invites to groups that require an entry fee.
2012-09-27 19:30:54 -05:00
Shyotl
88482a2431
An extra rendertarget is needed when fxaa dof are used in conjunction. mDeferredScreens color attachment was being used for both input and output when doing DoF combine, which is undefined behavior. Using mDeferredScreen for this works as it's no longer needed after lighting has been applied.
2012-09-26 20:45:47 -05:00
Shyotl
efbd339dc8
No return value? VisualStudio don' care.
2012-09-26 19:52:17 -05:00
Shyotl
ff28ce8d65
Corrections of some stupids (harmless copy-paste shenanigans in this case).
2012-09-26 19:51:24 -05:00
Lirusaito
cb33470673
Strings fix-up~
2012-09-25 16:02:17 -04:00
Lirusaito
e6389d62dc
Add debian/ubuntu support to install-deps script.
...
Also make the script more portable.
2012-09-25 16:01:43 -04:00
Aleric Inglewood
2766f17cb9
Merge remote-tracking branch 'github/master' into curlthreading3
2012-09-24 17:52:46 +02:00
Aleric Inglewood
70c36716c9
Disable SSL/TLS session caching.
...
Fixes: VWR-28039, VWR-28629
2012-09-24 17:05:23 +02:00
Aleric Inglewood
48702b1ed9
Various stuff
...
Comment fixes
Added some more debug support, not used yet (linux/libcwd only),
I used it, but won't commit the code that did.
Pass time_time parameter from post2() to prepRequest; only
used by mesh uploading at the moment.
2012-09-24 16:55:34 +02:00
Shyotl
16216b2ed0
Removed lscript_compile, lscript_execute, and lscript_library dependencies from newview.
2012-09-24 04:08:57 -05:00
Aleric Inglewood
3e22553d7e
Merge remote-tracking branch 'github/master' into curlthreading3
2012-09-23 17:40:07 +02:00
Aleric Inglewood
4744839a08
Bug fix for curl request queue of last commit.
...
In debug mode an assertion was triggered when a queued
request was being removed by the main thread; and rightfully
so: we should remove such request from the queue in that
case.
2012-09-23 17:31:41 +02:00
Lirusaito
cb0c13a1a1
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2012-09-23 10:25:22 -04:00
Drake Arconis
f0497a2721
Merge branch 'llqtwebkit'
2012-09-23 05:58:47 -04:00
Drake Arconis
77d018dbc8
Dependency install script for linux. Currently only supports Arch.
2012-09-23 00:51:29 -04:00
Drake Arconis
4be8b50360
Merge branch 'master' into llqtwebkit
2012-09-22 22:45:56 -04:00
Lirusaito
2581935b36
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/floater_post_process.xml - Used Mine, because Shyotl's is the ancient one from "the before time" and because my last commit (worked on motionblur tab, then, too.)
2012-09-22 15:12:45 -04:00
Aleric Inglewood
a7cf09883e
Merge branch 'master' into curlthreading3
2012-09-22 01:26:37 +02:00
Aleric Inglewood
1254a7bbe2
Merge remote-tracking branch 'github/master' into curlthreading3
...
Conflicts:
indra/aistatemachine/aistatemachine.cpp
2012-09-22 01:25:54 +02:00
Aleric Inglewood
fb5ec1d1f5
Implement curl connection throttling (CurlConcurrentConnections)
2012-09-21 19:26:40 +02:00
Aleric Inglewood
5bcb350d89
Always print '(CURL*)' in front of CURL*'s in debug output.
2012-09-21 01:48:21 +02:00
Aleric Inglewood
81bc6b49f8
Debug code bug fix; removal of CurlEasyHandle::getErrorString()
...
CurlEasyHandle::mErrorBuffer (CURLOPT_ERRORBUFFER) can NOT be
used to retrieve information about an error returned by
curl_multi_info_read in CURLMsg::data::result. This buffer is
only initialized when a curl_easy_* call returns an error,
and those errors are already printed automagically.
Initialize the buffer with an empty string upon invokation
of an curl_easy_* call, so we are sure the error belongs to
the last call.
2012-09-21 01:28:26 +02:00
Shyotl
9019a1eb23
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2012-09-20 15:29:28 -05:00
Aleric Inglewood
f3780998ed
Always reset stream state after using std::hex
2012-09-20 16:50:03 +02:00
Aleric Inglewood
27090c541f
Remove inconsistent dll linkage (missing LL_COMMON_API)
2012-09-20 05:36:11 +02:00
Aleric Inglewood
ef73469700
Merge remote-tracking branch 'singu/master'
...
Abandonning curlthreading2 -- which is now in master.
2012-09-20 05:17:56 +02:00
Aleric Inglewood
2d12a82a54
Always flush LLBufferStream objects.
2012-09-20 04:49:43 +02:00
Aleric Inglewood
c5d9dc4732
Bug fix
2012-09-20 04:48:03 +02:00
Drake Arconis
84ec70e707
Revert "Breakpad cmake"
...
This reverts commit b0415370f8 .
2012-09-19 20:50:54 -04:00
Siana Gearz
b7f5d7e415
Windows build fixes
2012-09-20 01:37:40 +02:00
Siana Gearz
8df7a52cf7
Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/llplugin/slplugin/CMakeLists.txt
2012-09-19 23:30:48 +02:00
Shyotl
9bb9292a41
Attempt to catch octree node manipulation while iterating over said nodes
2012-09-19 15:34:25 -05:00
Shyotl
438c499718
And the shader..
2012-09-19 15:34:15 -05:00
Shyotl
ff81d9461a
Added motionblur postprocess shader.
...
Conflicts:
indra/newview/skins/default/xui/en-us/floater_post_process.xml
2012-09-19 15:33:58 -05:00
Shyotl
f4f85aa1fd
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
...
Conflicts:
indra/newview/llviewerobject.cpp
2012-09-19 15:24:33 -05:00
Aleric Inglewood
56f2f0b727
Merge branch 'curlthreading2' into curlthreading3
2012-09-19 04:14:25 +02:00
Aleric Inglewood
19f325aa09
Merge remote-tracking branch 'singu/master' into curlthreading2
...
Conflicts:
indra/llcommon/CMakeLists.txt
Resolved with kdiff3 automatically.
2012-09-19 04:11:16 +02:00
Aleric Inglewood
1d5a63c180
Fixed showing TOS floater.
...
This creates a separate events interface structure
for CurlResponderBuffer (AICurlResponderBufferEvents)
for dealing with received HTTP headers.
The headers are passed to the Responder, but only
if the class derived from Responder implements
completedHeaders (otherwise it makes little sense
to even decode the headers).
Basically this is a reimplementation of the functionality
of the old LLHTTPClientURLAdaptor class.
2012-09-18 23:59:09 +02:00
Lirusaito
d7da5153f3
Fixed up the Post-Process floater~
...
Vertical tabs, as requested by Shyotl
2012-09-18 10:06:21 -04:00
Aleric Inglewood
c67f010302
Pass filename by reference when possible.
2012-09-18 05:01:34 +02:00
Drake Arconis
90a10b3508
Removed packaged dbghelp.dll
2012-09-17 22:40:30 -04:00
Drake Arconis
a09f7d274f
Fixed a bit of cmake derpyness
2012-09-17 22:23:57 -04:00
Drake Arconis
daa9466b7a
Spelling fixin a comment :D
2012-09-17 22:22:28 -04:00
Drake Arconis
efb252206b
Cached controls in cmdline chatbar
2012-09-17 22:22:02 -04:00
Drake Arconis
ffb847bbc0
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-09-16 16:40:49 -04:00
Siana Gearz
44b2392a10
Version 1.7.2
2012-09-15 21:33:09 +02:00
Siana Gearz
855540b5c5
Have i beaten you now, evil extortionists?
2012-09-15 21:31:33 +02:00
Siana Gearz
a7b9b0da42
Version 1.7.2
2012-09-15 21:17:16 +02:00
Siana Gearz
5f8eac9dc8
Have i beaten you now, evil extortionists?
2012-09-15 21:15:59 +02:00
Siana Gearz
b0ea103c61
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-09-15 17:05:50 +02:00
Siana Gearz
65781e6080
Make label 'Multiple' click through in texture selector
2012-09-15 08:36:38 +02:00
Siana Gearz
fc0149cdbc
Fix the Unlink button
2012-09-15 08:16:35 +02:00
Siana Gearz
3946c076fe
Oh i love our Coyotl
2012-09-15 07:34:06 +02:00
Aleric Inglewood
b5b6d3f85c
Fix PluginAttachDebuggerToPlugins for linux.
...
This fixes the problem that many terminals require command line
parameters to be passed as command line parameters to the terminal
command. The old code would pass the whole gdb command including
all it's arguments (whatever replaces %s) as a single argument,
regardless of whether there are quotes around the %s or not.
Now those arguments are passed as separate arguments if there
are no quotes around the %s.
Updated documentation with an example on how to open a gdb terminal
on a different machines X display.
2012-09-14 19:38:05 +02:00
Lirusaito
10f09dc15d
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-09-14 05:42:46 -04:00
Drake Arconis
f50d23a0d4
Fast Timers brought up to linden equiv
2012-09-14 00:30:52 -04:00
Drake Arconis
cb9f972d13
BE GONE
2012-09-14 00:30:25 -04:00
Shyotl
53fd33604d
Apparently blendstate needs to be set back to alpha after finishing drawing wireframe.
2012-09-14 03:42:16 +02:00
Siana Gearz
c8e3935648
GCC build fix
2012-09-14 02:56:40 +02:00
Shyotl
8f9c8ee293
Disabled reundant mesh wireframe passes. Outline wireframe pass not needed if sRenderHiddenSelections is set. Also enabled backface culling for outline pass. While these changes do improve performance a bit, they also seem to fix an atioglxx.dll crash (driver bug?)
2012-09-14 02:49:28 +02:00
Shyotl
767fe92de5
Invisprims in deferred now bind the correct shader when being drawn. (Fixes vbo attrib errors)
2012-09-14 02:45:22 +02:00
Shyotl
435b9cd1bb
Including these changes to llglshader might've been a good thing to do a few commits ago. Eups.
2012-09-14 02:44:51 +02:00
Shyotl
afc7c2b449
Better robustness when loading shaders. Redundant shaders (eg: "deferred/shadowF.glsl") will only need to be compiled once, and LLShaderMgr::mShaderObjects won't have previous entries mistakenly overwritten as a result.
2012-09-14 02:33:07 +02:00
Drake Arconis
e0a7c7e935
Renamed our log files to not conflict with linden
2012-09-13 19:39:02 -04:00
Drake Arconis
b0415370f8
Breakpad cmake
2012-09-13 18:19:38 -04:00
Drake Arconis
b7ff2fe3e3
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2012-09-13 18:09:46 -04:00
Siana Gearz
7978f5ebfe
Rebuild drawable when alpha changes
2012-09-13 06:38:36 +02:00
Lirusaito
b663110288
Fix Sound Upload not working
...
Was broken by a change in f77f846c8d
Thanks to Lucia TopHat and Tazy Scientist for helping me test and confirm all this.
2012-09-12 08:23:42 -04:00
Siana Gearz
3ef9e3bc69
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2012-09-11 20:18:05 +02:00
Aleric Inglewood
a032bd28ad
Merge branch 'curlthreading2' into curlthreading3
2012-09-11 17:05:13 +02:00
Aleric Inglewood
834a524a67
Compile fix.
...
This belongs to the latest merge with singu/master.
2012-09-11 17:03:57 +02:00
Aleric Inglewood
e3460bea09
Compile fix for openssl < 1.0.1
2012-09-11 15:51:18 +02:00
Lirusaito
31041f2ade
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-09-11 09:45:17 -04:00
Lirusaito
3320272673
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-09-11 09:30:25 -04:00
Aleric Inglewood
131959e388
Merge branch 'curlthreading2' into curlthreading3
2012-09-11 15:19:28 +02:00
Aleric Inglewood
d23835a6c2
Merge remote-tracking branch 'singu/master' into curlthreading2
...
Conflicts:
indra/newview/statemachine/aistatemachine.cpp
Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/
Obviously I did an "use ours" here.
2012-09-11 15:15:46 +02:00
Aleric Inglewood
e17632e0d5
Merge branch 'curlthreading2' into curlthreading3
2012-09-11 14:56:07 +02:00
Aleric Inglewood
d57a3b101b
Hide quilt patch directory
2012-09-11 14:54:51 +02:00
Aleric Inglewood
c2289c047b
Only disable TLS1.1 for openssl1.0.1 and higher, leaving SSL3 alone.
2012-09-11 02:05:54 +02:00
Siana Gearz
4ade726a07
Fix PATH-842 rotation reset on object update
2012-09-10 16:31:27 +02:00
Siana Gearz
856a45a775
Crash stopgaps from FS
2012-09-10 02:51:03 +02:00
Siana Gearz
f64ccbab7e
Scrollable fast timer view, by Liny
2012-09-10 02:36:37 +02:00
Siana Gearz
8a44c8fce1
Fast timer fix-up
...
The logic is incorrect in principle, but at least it's better behaved now.
Also, get fast timer out of important parts of aistatemachine.
2012-09-10 02:06:07 +02:00
Siana Gearz
2a70dde016
Start voice with mic muted
2012-09-08 09:49:12 +02:00
Siana Gearz
f1a5fb6b62
Fix LightShare annoyance for people who don't know what LightShare is
2012-09-08 08:12:13 +02:00
Siana Gearz
04bb15a108
Fix anti-aliasing in FBO mode
2012-09-08 08:09:30 +02:00
Drake Arconis
9b358a1b39
Initial llqtwebkit
2012-09-08 02:03:07 -04:00
Drake Arconis
86ad4aabf3
Cmake changes needed for standalone
2012-09-07 17:53:13 -04:00
Aleric Inglewood
36c097744c
Merge remote-tracking branch 'github/master'
2012-09-06 15:22:31 +02:00
Aleric Inglewood
e7cd445491
Merge branch 'curlthreading2' into curlthreading3
2012-09-06 15:12:22 +02:00
cry0
9b66d74382
Fixed lscript
...
Bison 2.6 caused some problems with indra.l and indra.y
2012-09-05 21:42:51 -05:00
Aleric Inglewood
e3752aefed
Fix loading Qt plugin on linux standalone.
...
For standalone there is no need to link libmedia_plugin_webkit.so
against Qt's plugins, and thus also not to add "random" paths
to LD_LIBRARY_PATH. Just let Qt do it's thing and find and
load the plugins it needs itself.
2012-09-05 19:29:47 +02:00
Aleric Inglewood
d8ff809092
Make webkit work with Qt 4.8
2012-09-05 04:12:13 +02:00
Aleric Inglewood
a8f5bf8baf
Bug fix.
...
dlerror() returns NULL when no errors have occurred since the last call
to dlerror() (or since the last call to dlopen(), dlsym() or dlclose()).
2012-09-05 02:15:41 +02:00
Aleric Inglewood
3a3605b812
Cherry pick from curlthreading2
2012-09-04 23:34:56 +02:00
Aleric Inglewood
f1c635d103
Cherry pick from curlthreading2
2012-09-04 23:34:11 +02:00
Aleric Inglewood
15cce79040
Merge remote-tracking branch 'singu/master' into curlthreading2
...
Conflicts:
indra/llmessage/llcurl.cpp
Changes to unused file (I'll remove it when I'm done).
2012-09-04 17:38:11 +02:00
Siana Gearz
fef681be7c
Fix annoyance in debug build on OpenSim
2012-09-04 12:54:47 +02:00
Siana Gearz
e379a5a03e
Allow super thin objects on OpenSim
2012-09-04 12:37:22 +02:00
Lirusaito
f2b4911f60
Space, the final frontier
2012-09-02 15:41:14 -04:00
Lirusaito
ff93de6e61
Fix for P2P Voice Volume slider overlapping End call button.
2012-09-02 14:38:49 -04:00
Siana Gearz
29adc28d80
ivec4 still needed as texture index on some SONY VAIO and Toshiba ATI drivers.
...
This reverts commit b8b235df09 .
2012-09-02 19:26:28 +02:00
Shyotl
118937aa99
Fow windows, client is now more likeley to create gl context that actually matches desired multi-sample value.
2012-09-02 08:49:46 +02:00
Shyotl
6ec4c65f04
A few nullchecks, and removal of pointless uint < 0 bounds checks.
2012-09-02 08:48:52 +02:00
Shyotl
fefb40bda2
MAINT-675: Fix for DoF focal point being incorrect when alt-zooming on terrain. http://hg.secondlife.com/viewer-development/changeset/4e362886866692fa904a88adcf3e11b7518802f3
2012-09-02 08:47:20 +02:00
Shyotl
c5938f7d31
Removed prim joint logic. (Dead code)
2012-09-02 08:47:03 +02:00
Shyotl
e748b74c67
Hook floater with primary focus(and is therefore opaque) into the occlusion system.
2012-09-02 08:46:21 +02:00
Shyotl
a957d58939
SH-3238: Textures are loaded at lower detail on subsequent log-ins. http://hg.secondlife.com/viewer-development/changeset/e9975f600436ab692e541662bcadfa7a04c97e1d
2012-09-02 08:44:25 +02:00
Lirusaito
37a9a52544
Improve on translation in llviewermessage.cpp
...
More sync with v-d for llviewermessage.cpp
space changes mostly
2012-09-02 02:30:38 -04:00
Siana Gearz
566d70a6d1
Restore applying anti-aliasing from preferences
2012-09-02 06:39:50 +02:00
Lirusaito
7b7157f491
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-09-01 10:08:29 -04:00
Lirusaito
ea8791697e
Sync more code with upstream, Translations galore, even translations for AntiSpam!
...
Updated AntiSpam with documentation, safety measures, and better presentations and clarifications for the end-user from FS.
If it looks like something was removed from an xml, it was just moved to fall into place better with v-d.
Corrected log end message being log start message.
2012-09-01 00:43:30 -04:00
Aleric Inglewood
dd9f7bba5d
Merge branch 'curlthreading2' of github.com:AlericInglewood/SingularityViewer into curlthreading2
2012-09-01 04:02:45 +02:00
Aleric Inglewood
8051cd4194
Install fix for latest 32bitcompatibilitylibs
2012-09-01 03:56:52 +02:00
Siana Gearz
b4a7fa1ad9
Force Vorbis to link before FMODEx
2012-09-01 03:10:26 +02:00
Siana Gearz
e460bd9a69
Yet another attempt at getting old ATI drivers not to do all pink
2012-09-01 01:35:35 +02:00
Siana Gearz
5a3082275e
Fix object update on OpenSim regions with mesh disabled
2012-08-31 19:55:49 +02:00
Siana Gearz
bdf20355b6
Added OSGrid
2012-08-31 06:36:47 +02:00
Aleric Inglewood
21ea923520
Compile fix for OSX
2012-08-31 05:50:42 +02:00
Aleric Inglewood
484fff444f
Compile fix for OSX
2012-08-31 05:23:20 +02:00
Siana Gearz
f63d0abbc1
Fix multi-preview for textures
2012-08-30 14:03:27 +02:00
Siana Gearz
5a05898ec4
Callum Linden's tcmalloc
2012-08-30 08:38:56 +02:00
Lirusaito
b9ee7cc30a
Expose pick import/export feature
...
Why did Beeks ever comment this out? Certainly works now...
2012-08-29 23:00:09 -04:00
Siana Gearz
03ee96cdff
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-08-30 04:49:41 +02:00
Siana Gearz
be2598bc4c
Attempt to fix effect shaders
2012-08-30 02:58:50 +02:00
Lirusaito
01f5fe6eb1
Restore object rotation code to fix Issue 454
...
Just a partial revert of aca3e8f6c4
_PREHASH_ObjectRotation and sendRotationUpdate
2012-08-29 13:34:27 -04:00
Siana Gearz
32f9cbb11d
Revert "MAINT-646: Hotspot in LLViewerObjectList::update"
...
This reverts commit d8fc691625 .
2012-08-27 07:32:29 +02:00
Damian Zhaoying
67e99c799c
Add new panel_navmesh_rebake.xml file and erase floater_hex.xml file from spanish language files
2012-08-26 06:11:40 -03:00
Damian Zhaoying
da5284c6b8
Fix and update some spanish translations
2012-08-26 06:01:35 -03:00
Damian Zhaoying
c2fa79347e
Merge remote-tracking branch 'upstream/master'
2012-08-26 05:53:32 -03:00
Siana Gearz
953a7ff066
Fix growth of linker flags on windows
2012-08-26 08:12:23 +02:00
Lirusaito
84cabd6a1e
Added Nomade's SecondLove skin
2012-08-25 16:23:29 -04:00
Siana Gearz
e1a6b7e249
Correct a whoopsie there
2012-08-25 19:41:34 +02:00
Damian Zhaoying
72b342912e
Merge remote-tracking branch 'upstream/master'
2012-08-24 17:07:02 -03:00
Lirusaito
07f52c463e
Fixed crash reported by Naudia Nadezda, crash when closing a texture multipreview.
...
Also updated LLPreviewTexture to be closer to upstream and better for translation,
added lltrans for FileSaved and Receiving,
and floater_preview_texture.xml now uses No Alpha, Has Alpha, Unknown as strings.
2012-08-23 23:53:36 -04:00
Lirusaito
064f0216b4
Disable Newline AntiSpam when AntiSpam is not enabled.
2012-08-23 18:55:57 -04:00
Lirusaito
70a4d113b3
Fix placement of the History Button having spacing when Voice is Disabled.
2012-08-23 18:55:20 -04:00
Lirusaito
2001d6b6ec
Skins update, enter Nomade's (cleaned up) skins!
...
Fixed all skins to use DefaultListText properly.
Fixed white_emerald to use textures directory instead of Textures directory.
2012-08-23 18:51:40 -04:00
Siana Gearz
b278cbb32e
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-08-23 07:26:19 +02:00
Siana Gearz
7ec9af8200
Parcel media crash fix
2012-08-23 07:25:36 +02:00
Lirusaito
71b0c35653
AntiSpam improvements: Less sensitive defaults for sound multi's and an off switch.
...
Polished the Spam tab a bit...
Also, slightly better errors for antispam bugs... Which Ruby neglected to take from me...
2012-08-23 00:12:09 -04:00
Damian Zhaoying
4032df3115
Merge remote-tracking branch 'upstream/master'
2012-08-22 11:44:10 -03:00
Lirusaito
6eadc29ca0
Polish About floater Credits tabs, and remove translation of Credits and Licenses tabs.
2012-08-21 18:39:55 -04:00
Lirusaito
c6f7a39d22
A tiny sync with v-d in LLGLSandBox/LLViewerParcelMgr
2012-08-21 16:49:44 -04:00
Siana Gearz
73099edae3
Version 1.7.1
2012-08-21 22:06:23 +02:00
Siana Gearz
f53646764c
Merge git://github.com/TighMacFanatic/SingularityViewer
2012-08-21 22:01:46 +02:00
Siana Gearz
7b42fea0f5
Stricter git
2012-08-21 19:17:45 +02:00
Siana Gearz
df1e9732d0
Developers, profile thy profiler!
2012-08-21 07:43:47 +02:00
Siana Gearz
822ba4432f
Typo fix and MeshMaxConcurrentRequest bumped by demand
2012-08-21 07:43:00 +02:00
TighMacFanatic
8e6c6acf18
Fix issue preventing the spinner/copy/paste from working for position when editting attachments.
2012-08-20 23:54:03 -04:00
Aleric Inglewood
83b13f6a3f
WIP: make everything use AICurlEasyRequestStateMachine
2012-08-20 21:18:19 +02:00
Siana Gearz
aceb3f3425
Fix playback of streams with über-long header, thx to Brett@FMOD
2012-08-20 16:09:55 +02:00
Siana Gearz
37f2ec2f9f
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-08-20 05:16:17 +02:00
Shyotl
4d1e822de7
Fixed ancient annoyance of enabling any debug info display clobbering object hovertext. Object's real hovertext is now cached, and only substituted if overridden by setDebugText, and is properly recovered when debug text is cleared.
2012-08-20 05:10:29 +02:00
Shyotl
b8276fd8e3
MAINT-685: Fix for disabling basic shaders making high detail terrain render incorrectly. http://hg.secondlife.com/viewer-development/changeset/218a7b78dcc5f53f38de063f3a229a7462fe052f
2012-08-20 05:10:15 +02:00
Siana Gearz
d319ebc0a8
Shift-crouch-toggle is now a setting
2012-08-20 05:05:39 +02:00
Siana Gearz
5f32d9347d
Place region console where people expect to find it
2012-08-20 04:41:49 +02:00
Siana Gearz
ba136fe42d
Remove annoying sim version change notification - like viewer 2
2012-08-20 04:22:26 +02:00
Siana Gearz
e4090b1475
Fix up the link/unlink buttons
2012-08-20 03:31:11 +02:00
Siana Gearz
b7d2ecbf1a
Able to play media again, thx VoodooSam
2012-08-20 02:34:39 +02:00
Siana Gearz
f77f846c8d
Anim upload issues fixed, bulk upload clarified.
2012-08-19 23:58:10 +02:00
Siana Gearz
23b34aeb92
Fix FMOD Ex packaging
2012-08-19 19:04:22 +02:00
Damian Zhaoying
59c887129d
Merge remote-tracking branch 'upstream/master'
2012-08-18 18:50:17 -03:00
Lirusaito
bd7cd9245a
A tiny sync with v-d in LLGLSandBox/LLViewerParcelMgr
2012-08-16 09:21:46 -04:00
Latif Khalifa
53c7cf116c
Implement setting home position the way V3 does it, with CAP fallback
2012-08-16 08:00:42 +02:00
Siana Gearz
95b7842e31
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-08-16 03:46:32 +02:00
Siana Gearz
0b953ccc40
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2012-08-16 03:37:50 +02:00
Siana Gearz
41c4eabcaa
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-08-16 03:37:34 +02:00
Siana Gearz
0a33a3a71a
This should at least stop crash from pathfinding notification till we have figured it out better.
2012-08-16 03:37:13 +02:00
Shyotl
d6b470cd07
Just call LLPipeline::refreshCachedSettings() in LLViewerShaderManager::setShaders() to avoid occlusion-related crashes if certain shaders failed to load.
2012-08-15 16:21:10 -05:00
Lirusaito
d1cb627582
What started out as removing the newline spam in LLPanelObject, ended as cleanup/sync with v-d.
...
Jus' want files to be nice to read, but then... a bunch of them are all messy.. so... Fixed~
2012-08-15 10:00:47 -04:00
Lirusaito
1d99158562
newview/CMakeLists.txt alphabetized and brought closer to v-d.
...
Yay cleaning~
2012-08-15 02:10:10 -04:00
Aleric Inglewood
05c32c7a62
Merge branch 'curlthreading2' into curlthreading3
2012-08-15 05:44:17 +02:00
Aleric Inglewood
ea4d32b4ad
Compile fix.
2012-08-15 05:43:12 +02:00
Lirusaito
bb9e260793
LLViewerMenuFile, missed a spot with translation.
...
Also rearranged includes, for better sync with upstream v-d...
2012-08-14 19:47:39 -04:00
Aleric Inglewood
536cb6febd
Merge branch 'curlthreading2' into curlthreading3
...
Conflicts:
indra/CMakeLists.txt
indra/llcommon/llstring.h
indra/llmessage/CMakeLists.txt
indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
indra/newview/hipporestrequest.cpp
indra/newview/llappviewer.cpp
2012-08-15 00:51:40 +02:00
Latif Khalifa
258fe8bad0
Fixed region windlight on OpenSim. It's not possible to assume that the mere existance of M7WL should mean override of RegionWindlight as M7WL is always sent. If M7WL is to have a preference some other method must be devised, ie. a debug setting
2012-08-14 21:30:25 +02:00
Latif Khalifa
74772a1f61
One should never invoke CAPs request without checking if the capability is present. Fixes setting home location on OSGrid, issue #426
2012-08-14 19:30:49 +02:00
Siana Gearz
bdaa5f20a1
Auto detach Firestorm bridge
2012-08-14 08:11:15 +02:00
Aleric Inglewood
19293601b3
Manual pick of stuff from 'shycurl' ( 68ad5411) that seemed to make sense.
2012-08-14 02:38:06 +02:00
Shyotl
f2bcfa5275
Use cachedcontrol in LLViewerObjectList::update.
2012-08-13 18:51:37 -05:00
Siana Gearz
6265027222
Commonly requested resolutions for HD monitors
...
Totally wish i had that last one! Wheeee, SPAAAACE!
2012-08-14 00:35:53 +02:00
Siana Gearz
36ff4dcd11
Don't feed empty, non-working callback to CURL
...
Cherry-Pick of 96a4e16a
Conflicts:
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
indra/newview/hipporestrequest.cpp
Clear reasons for conflicts, resolved.
2012-08-13 23:33:49 +02:00
Aleric Inglewood
35a53ef1d7
Bug fix (needed for libcwd with memory allocation debugging)
2012-08-13 21:59:57 +02:00
Siana Gearz
507c5eb7ca
Fix classified search
2012-08-13 21:50:09 +02:00
Aleric Inglewood
169670a58b
Refurbish last merge. Fix compile for standalone and libcwd.
2012-08-13 19:30:35 +02:00
Aleric Inglewood
fbb5dced97
Merge remote-tracking branch 'singu/master' into curlthreading2
...
Conflicts:
indra/llcommon/CMakeLists.txt
indra/llmessage/llcurl.cpp
indra/llmessage/llcurl.h
indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h
indra/llmessage/llpumpio.cpp
indra/llmessage/llpumpio.h
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
indra/newview/hipporestrequest.cpp
indra/newview/llappviewer.cpp
indra/newview/llspatialpartition.cpp
indra/newview/llviewermedia.cpp
indra/newview/llxmlrpctransaction.cpp
Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.
2012-08-13 17:07:25 +02:00
Shyotl
aa54a386f3
Fix regression introduced in pathfinding (avelocity bugs)
2012-08-13 02:55:47 -05:00
Siana Gearz
6b8c58e3b5
Safe and probably pointless crash workarounds from FS and LL
2012-08-13 06:14:16 +02:00
Lirusaito
67f4797e09
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-08-12 22:58:22 -04:00
Siana Gearz
7335ae548c
Add script teleport permission
2012-08-13 03:04:33 +02:00
Siana Gearz
0b1a5bc3c1
Translation file clean-up
2012-08-13 02:23:08 +02:00
Siana Gearz
e9c54bb5e4
Fix voice icon in chat floater tab
2012-08-13 01:56:35 +02:00
Siana Gearz
4294038271
Potential HTTP fixes from viewer-http
2012-08-12 22:39:33 +02:00
Lirusaito
408eab13f0
Removed a duplicate string
2012-08-12 16:04:22 -04:00
Siana Gearz
ee0bd9ee76
De-uglify graphics preferences
2012-08-12 20:52:57 +02:00
Aleric Inglewood
263a25fb87
Compile fix for DEBUG_CURLIO
2012-08-12 17:42:30 +02:00
Aleric Inglewood
fa10ce28d2
Missing header
2012-08-12 17:10:44 +02:00
Siana Gearz
039f665af1
Hopefully fix FMOD Ex packaging this time
2012-08-12 16:38:25 +02:00
Aleric Inglewood
304fa05094
Suppress "Expect:" header for POST and PUT. No longer use CURLOPT_COPYPOSTFIELDS.
...
For POST and PUT, libcurl adds by default a "Expect: 100-continue"
header and wait for the server to reply with a 100 response.
However, since the server never does that (LL comment in the
code "I'm not sure what it means") it's up to libcurl to continue
anyway after a while and that part is apparently bugged, causing
people not to be able to login sometimes. But suppressing the
header, libcurl doesn't wait for it and we worked around this bug.
The commit introduces a much improved CurlEasyRequest::setPost
method that enforces the above for POST, but that also no longer
uses CURLOPT_COPYPOSTFIELDS (but CURLOPT_POSTFIELDS), no longer
making a copy of the body of what we are going to send to the server.
Instead it uses a new object, derived from AIPostField, to keep track
of this data and to dispose of it once the transaction is complete
(and no sooner).
Copied from llcorehttp, we now also always set a "Connection:
keep-alive" and "Keep-alive: 300" header for POST.
This was already done for texture downloads (HttpOpRequest),
but now we do it always :p. Might need to be changed in the
future, but currently those headers are ignored by the server
anyway.
2012-08-12 16:34:20 +02:00
Siana Gearz
89ad14b82f
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-08-12 14:52:47 +02:00
Siana Gearz
73785af730
Fix permission panel unclickable
2012-08-12 13:33:27 +02:00
Siana Gearz
d2c3e50a3f
Fix LLTrans for Unknown
2012-08-12 13:15:42 +02:00
Aleric Inglewood
2fbe7ab6ce
Only accept pointers to valid types for getinfo().
2012-08-12 03:38:45 +02:00
Aleric Inglewood
164799e4c4
Curl debug output improvements and minor fixes.
2012-08-12 03:33:33 +02:00
Siana Gearz
4f57269518
Fix show muted text in chat
2012-08-11 22:26:31 +02:00
Lirusaito
92c9311a4c
gpu_table update!
2012-08-11 02:51:49 -04:00
Lirusaito
ca6fd89700
Initial gpu_table retabbing, nothing important.
2012-08-11 01:49:15 -04:00
Lirusaito
80b100f135
Fix "KeyError: 'extra_libraries'" when compiling without FMOD Ex.
2012-08-11 00:48:36 -04:00
Lirusaito
8e12f11089
Forgot to commit this include
2012-08-11 00:09:09 -04:00
Lirusaito
f4324e8890
Merge branch 'future' of git://github.com/Lirusaito/SingularityViewer
...
Conflicts:
indra/llrender/llpostprocess.cpp
2012-08-10 23:39:06 -04:00
Lirusaito
fda34fea46
Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer
2012-08-10 23:30:56 -04:00
Lirusaito
0770150455
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-08-10 23:30:16 -04:00
Lirusaito
d79a8fc87b
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-08-10 23:27:42 -04:00
Aleric Inglewood
8e1bbfe938
Amend last commit
2012-08-11 03:29:46 +02:00
Aleric Inglewood
3469d65f95
Windows compile and linker fixes.
...
* Do not include aithreadid.h from debug.h, because the latter is
included everywhere (from linden_common.h) and aithreadid.h is
heavy (includes among others windows.h).
* On windows, thread local members cannot be exported.
2012-08-11 03:23:31 +02:00
Lirusaito
486536f92d
Allow antispam time to be set to 0, for disabling Antispam.
2012-08-10 18:41:50 -04:00
Aleric Inglewood
70717cb6c8
Compile bug fix for windows.
2012-08-10 14:49:34 +02:00
Aleric Inglewood
94ebcdeb6b
Add eight missing headers...
...
How did you ever get this to compile if those
headers were removed from the precompiled header?
2012-08-10 07:23:29 +02:00
Aleric Inglewood
152238e67f
Merge remote-tracking branch 'shyotl/breakforce' into breakforce
2012-08-10 05:56:28 +02:00
Shyotl
eef51e0bd0
Pulled llpacketring.h and llhttpclient.h out of the precompiled header.
2012-08-09 22:50:05 -05:00
Aleric Inglewood
91df8446b0
Oops bug fix for last commit.
2012-08-10 05:37:41 +02:00
Aleric Inglewood
ffb55f482a
Compile fixes for windows.
2012-08-10 05:35:11 +02:00
Aleric Inglewood
b2c5a84964
Replace CURLOPT_POSTFIELDSIZE_LARGE with CURLOPT_POSTFIELDSIZE
...
Also adds a more robust interface for setopt that does
type checking based on the options used. This fixes one
bug where a F32 was passed and interpreted as long.
In many cases a U32 or S32 was passed as long, which
would fail (only) on a 64bit non-windows big endian machine.
2012-08-10 04:18:04 +02:00
Drake Arconis
0be43cf1c2
Fixed GCC47 issues and fmodex copying
2012-08-09 10:56:29 -04:00
Siana Gearz
f5923860fa
Remove maximum selection limit of 20 friends, no longer present in viewer 2/3
2012-08-09 15:39:22 +02:00
Siana Gearz
adc2921f38
Fix push to talk lock
2012-08-09 15:28:04 +02:00
Siana Gearz
ca630a106e
Merge fix
2012-08-09 15:21:38 +02:00
Drake Arconis
cbbc42d564
Merge remote-tracking branch 'singularity/master' into AltCompilers
2012-08-09 08:44:14 -04:00
Aleric Inglewood
0054e6a378
Bug fix.
...
Fixes an exit crash when the user clicks on Login and immediately
on Quit, because termination of the LLAuth curl request statemachine
access the CurlRequestTimeOut debug setting.
2012-08-09 07:04:23 +02:00
Aleric Inglewood
76e30150b9
Removed superfluous debug output
2012-08-09 07:02:42 +02:00
Aleric Inglewood
cd197a3807
Fix LL_REF_COUNT_DEBUG debug code.
...
This code was broken with respect to LLAPRPool.
Fix that, and also fixed it for the new AIThreadID API.
2012-08-09 07:00:51 +02:00
Aleric Inglewood
b9673df961
Clean up of debug.h: just use LL_COMMON_API.
2012-08-09 06:57:53 +02:00
Aleric Inglewood
37c8ea54eb
Add AIThreadID - Cleanup of apr_os_thread* related code.
...
Apart from just really cleaning things up and moving
everything into one class regarding thread IDs (ie,
is_main_thread(), comparing ID's etc), this also
fixes an obscure bug where LL was casting thread ID's
to U32 and then compared those to find out if it
the same thread. It's theoretically possible that
such fails on a 64bit OS.
By generalizing the interface, I adopted the use
of a thread-local cache for the current thread ID
as used by LLMutex et al, so now all code benefits
from that. The idea was even extended to now also
be used for is_main_thread() tests and even resetting
a thread ID to the ID of the current thread.
2012-08-09 06:30:31 +02:00
Siana Gearz
e616b40c6f
Autodetect music stream type properly
2012-08-09 05:09:02 +02:00
Siana Gearz
26109ca8f9
Assert fix
2012-08-09 04:50:48 +02:00
Siana Gearz
46e57d4f1c
Package FMOD Ex on Linux
2012-08-09 03:46:24 +02:00
Siana Gearz
7743843a27
Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/strings.xml
2012-08-09 03:46:03 +02:00
Siana Gearz
c84e145557
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llrender/llrendertarget.cpp
indra/newview/lloverlaybar.cpp
2012-08-09 02:11:14 +02:00
Drake Arconis
e767392b44
Merge remote-tracking branch 'shyotl/future' into AltCompilers
...
Conflicts:
indra/llrender/llrendertarget.cpp
indra/newview/llvovolume.cpp
2012-08-08 18:54:04 -04:00
Drake Arconis
457177905d
Merge remote-tracking branch 'singularity/master' into AltCompilers
2012-08-08 18:50:03 -04:00
Siana Gearz
de74443d76
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvovolume.cpp
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
2012-08-09 00:42:23 +02:00
Siana Gearz
f3e7340118
Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer
...
Conflicts:
indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
2012-08-09 00:02:50 +02:00
Lirusaito
efe3dd77fa
Address Issue 91: Estate ban button added to radar
...
Shift-Enter in radar now starts an IM with people selected.
Also, it seems Dark used black for texts and should... so... let's reverse that change.
2012-08-08 15:51:26 -04:00
Damian Zhaoying
7c690b9de1
Merge remote-tracking branch 'upstream/master'
2012-08-08 12:56:07 -03:00
Lirusaito
5ce8770dc3
Fix Issue 304: export texture in png too
...
code adapted from that bird that burnt to death...
2012-08-08 10:50:17 -04:00
Damian Zhaoying
e9ddd6b8f8
Merge remote-tracking branch 'upstream/master'
2012-08-08 01:03:49 -03:00
Aleric Inglewood
f94f458922
Print CURL_SOCKET_TIMEOUT for that particular value.
2012-08-08 04:10:34 +02:00
Aleric Inglewood
89ef06fd3f
Compiler warning fixes. Take into account that debug_libcurl.cpp is no longer linked dynamically.
2012-08-08 01:58:49 +02:00
Aleric Inglewood
ccd135b2a6
and again
2012-08-08 01:04:27 +02:00
Aleric Inglewood
80eb0851d9
Fix stupidity
2012-08-08 01:02:08 +02:00
Aleric Inglewood
b84f470fca
Bug fix: curl_off_t has a different size than void* on 32 bit.
2012-08-08 00:40:01 +02:00
Aleric Inglewood
5caeccc007
Final compile/link bug fixes for debug_libcurl code.
...
renamed cwdebug/debug_libcurl.cc -> llmessage/debug_libcurl.cpp
and cwdebug/debug_libcurl.h -> llmessage/debug_libcurl.h,
because debug_libcurl.cpp does curl calls that do ares and
openssl calls, so we need to link with those libraries.
llmessage is already linking with those libraries, and contains
the main entry point aicurl.h, so it's a suitable place to put
this.
Bug fix: must always include llpreprocessor.h before including
curl/curl.h.
Bug fix: Added #include "debug_libcurl.h" to hipporestrequest.cpp
and llurlsimstring.cpp which I missed before because they
included "curl/curl.h" instead of <curl/curl.h>. Same in
llwaterparammanager.cpp, but removed include there because it
isn't needed.
Now test DEBUG_CURLIO before including debug_curlio, that
seems better, because otherwise it would make more sense to
replace all #include <curl/curl.h> with #include "mycurl.h"
and then do it there-- but I didn't want to do that.
Bug fix: we undef-ed CURLOPT_DNS_USE_GLOBAL_CACHE, while really
that is an enum, not a macro.
Fixed DEBUG_WINDOWS_CODE_ON_LINUX again by adding a hack for
ioctlsocket(), not instantiating dumb_socketpair unless
DEBUG_WINDOWS_CODE_ON_LINUX is defined and removing again ^M's
introduced with the new windows non-blocking code.
Also changed the type of flags passed to fcntl to int (was long).
2012-08-07 20:57:39 +02:00
Siana Gearz
96a4e16a4b
Don't feed empty, non-working callback to CURL
2012-08-07 18:21:36 +02:00
Aleric Inglewood
477c657f60
Merge remote-tracking branch 'singu/breakforce' into breakforce
2012-08-07 16:19:20 +02:00
Siana Gearz
68ad5411c9
Shyotl's old llcurl
2012-08-07 13:13:45 +02:00
Aleric Inglewood
cc50e620c0
Merge branch 'curlthreading2' into breakforce
2012-08-07 05:22:10 +02:00
Aleric Inglewood
8646abb18b
Merge branch 'curlthreading2' into curlthreading3
2012-08-07 05:21:52 +02:00
Aleric Inglewood
2fbf6b732e
Fix undefined symbols linker error on linux / relwithdebinfo.
...
See http://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Interface.html
With this patch, the #pragma will also be used with icc and clang,
I didn't test this.
2012-08-07 05:18:24 +02:00
Aleric Inglewood
93416e40a4
Compile fix: CURLOPT_SSL_OPTIONS was also added since 7.25.0
2012-08-07 05:16:59 +02:00
Lirusaito
d2210414bc
Misplaced closing parenthesis...
2012-08-06 23:15:50 -04:00
Lirusaito
e6e9a21597
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-08-06 20:33:21 -04:00
Aleric Inglewood
e14be5c8c2
Make debug_libcurl.cc compile with libcurl 7.21 and higher
2012-08-07 01:33:29 +02:00
Lirusaito
f9b3561ca8
Typo fix
2012-08-06 17:24:01 -04:00
Aleric Inglewood
95083e846b
WIP
2012-08-06 23:19:09 +02:00
Damian Zhaoying
ce415fb65c
Merge remote-tracking branch 'upstream/master'
2012-08-06 15:56:30 -03:00
Aleric Inglewood
f479ea4bcf
Merge branch 'curlthreading2' into curlthreading3
2012-08-06 19:55:19 +02:00
Shyotl
1a6c00ca8b
Display pathfinding attributes in build floater.
2012-08-06 12:26:28 -05:00
Shyotl
58033d3cbc
Added rebake navmesh button. Brought in rest of the underlying navmesh implementation.
2012-08-06 10:11:12 -05:00
Lirusaito
4c23ab029a
Missing Strings.
...
Oops. Customize Floater wants these for like once case...
2012-08-06 02:38:09 -04:00
Lirusaito
0846f8a963
Fixeds and ToDones
...
-Color Fixies-
Fixed Gemini skin not looking as it originally did.
We now use DefaultListText to color all otherwise uncolored text in scroll list cells.
All of our dark skins have been updated to use white here, as dark skins are intended to have white text...
This includes the Dark we ship with.
LLFloaterActiveSpeakers no longer uses hard coded font colors, it uses SpeakersInactive, DefaultListText, and SpeakersGhost.
LLFloaterAvatarList no longer uses hard coded font colors, it uses DefaultListText, RadarTextChatRange, RadarTextShoutRange, and RadarTextDrawDist, in place of previously hard coded font colors
Since the tooltip defines color meaning, these new colors should only be skinned to change shade.
DefaultListText defaults to black; SpeaksInactive, gray(grey4); SpeakersGhost, Red; RadarTextChatRange, Red; RadarTextShoutRange, Yellow(yellow1); RadarTextDrawDist, Green(green2).
-Translation update and fixies-
Partial credit to viewer-development, thanks for hanging onto old strings! Also, updated to look more like v-d in translated areas.
Punctuation strings can be used quite a lot. Brought them all in, just in case.
AscentPrefs*:
Drag and Drop points now use CurrentlySetTo, CurrentlyNotSet, AnItemNotOnThisAccount, and NotLoggedIn. (applies, as well, to FloaterAO)
Power User message is now built from PowerUser1, PowerUser2, Unlocked:, PowerUser3, RightClick, PowerUser4 and PowerUser5; this should give translators enough space to explain any tough to translate, and make the message easier to alter in the future, if necessary.
LLCompileQueue:
Now uses translation strings from upstream
Starting, Done, Resetting, Running, and NotRunning in its xml.
CompileQueueTitle, CompileQueueStart, CompileQueueDownloadedCompiling, CompileQueueScriptNotFound, CompileQueueProblemDownloading, CompileQueueInsufficientPermDownload, CompileQueueInsufficientPermFor, CompileQueueUnknownFailure, ResetQueueTitle, ResetQueueStart, NotRunQueueTitle, and NotRunQueueStart from strings.
LLFloaterAvatarList(floater_radar) now uses has_entered, has_left, the_sim, draw_distance, shout_range, and chat_range in its xml for translatable alerts.
LLFloaterLand(floater_about_land) now uses minutes, 1_minute, 1_second, seconds, and remaining from its xml.
LLFloaterLand, LLFolderView, LLPanelDirBrowser now make use of InventoryNoMatchingItems, NoneFound, and Searching in their searches.
LLFolderView was brought closer to v-d in translation.
LLGroupNotify now uses GroupNotifyGroupNotice, GroupNotifySentBy, GroupNotifyAttached, next (also now used by LLNotify), ok, GroupNotifyGroupNotices, GroupNotifyViewPastNotices, GroupNotifyOpenAttachment, and GroupNotifySaveAttachment.
LLInventoryFilter synced with V-D for translation:
Now uses Animations, Calling Cards, Clothing, Gestures, Landmarks, Notecards, Objects, Scripts, Sounds, Textures, Snapshots, No Filters, Since Logoff, and Worn.
LLManipRotate now uses Direction_Forward, Direction_Left, Direction_Right, Direction_Back, Direction_North, Direction_South, Direction_West, Direction_East, Direction_Up, and Direction_Down, like upstream v-d.
LLPanelAvatar(panel_avatar) now uses None string in its xml for when there are no groups, also removed cruft. Though the None has not been showing up for quite some time, anyway...
LLPanelObjectInventory now uses Buy, LoadingContents and NoContents,
however the last two strings did not seem to show up anyway...
thanks to Latif Khalifa, Jean Horten, theGenius Indigo and Cubbi Bearcat for confirming this happens across many different versions and on both Windows and linux(32 and 64).
LLPreviewScript now uses CompileSuccessful, SaveComplete, ObjectOutOfRange, and CompileSuccessfulSaving.
LLScrollingPanelParam now translates Less and More.
Avatar Shape Information strings now used for customize appearance panels.
LLTextureCtrl now uses multiple_textures.
LLToolpie has been updated to use v-d include order and now uses UnmuteAvatar, MuteAvatar, UnmuteObject, and MuteObject2 strings.
LLVOAvatarSelf now uses BodyParts* strings for translation of toolpie entries pertaining to bodyparts.
LLViewerMenuFile now uses UnknownFileExtension, and UploadingCosts.
LLViewerMessage now uses Cancel(also used by LLViewerDisplay), AcquiredItems, Saved_message, IM_autoresponse_sent_item, IM_autoresponded_to, IM_announce_incoming, InvOfferDecline, InvOfferGaveYou, InvOfferOwnedByUnknownUser, InvOfferAnObjectNamed, InvOfferOwnedBy, InvOfferOwnedByUnknownGroup, and InvOfferOwnedByGroup.
-AvatarRadar Update-
AvatarRadar enhanced with code from both Cool VL Viewer and some avian corpse.
e_radar_alert_type has been reworked to allow bitwise usage in the future.
Cool stuff:
gSavedSettings for radar are now CachedControls,
entering boolean is now checked before going into the switchcase,
Style changes, yay C++ style.
Avian Flu:
Distance for shout range corrected to be 96.
handleKeyHere: If the user hits enter with an avatar on the radar selected, focus camera on selected avatar; ctrl-enter, teleport to selected avatar.
Otherwise:
Tiny spelling fixies, and a suggestive comment.
2012-08-05 20:40:02 -04:00
Aleric Inglewood
65a1aae629
Bug fix
...
curl_easy_setopt expects a long int. Before this patch,
uninitialized memory was read, leading to extreme long
time out, instead of the intended disabled time out (so,
in practise this patch has little effect).
This bug was discovered with the previous commit.
2012-08-05 18:55:27 +02:00
Aleric Inglewood
caef97ad36
Print all libcurl calls if -DDEBUG_CURLIO. Don't create static lib for cwdebug.
...
Basically, cmake doesn't support linking static libs into a shared lib.
The correct way is to just specify source files in subdirectories
directly as source files of the shared library. This patch changes that.
Also, after this commit, when DEBUG_CURLIO is defined, every call to
libcurl is printed to llinfos (or to dc::curl when using libcwd).
2012-08-05 18:51:21 +02:00
Siana Gearz
761439cc8d
Setting socket pair non-blocking
2012-08-05 08:20:31 +02:00
Shyotl
b847c53395
Implemented basic 'awareness' of objects flagged as permanent.
2012-08-04 20:46:51 -05:00
Shyotl
aca3e8f6c4
Cleanup. Removal of dead code. Added/renamed object flag accessors.
2012-08-04 18:18:22 -05:00
Shyotl
7122a7c174
Added sim console.
2012-08-04 13:43:32 -05:00
Drake Arconis
769a7b89d2
More Media Updates
...
Further updated llviewermedia
2012-08-03 23:14:03 -04:00
Shyotl
d2b13f515d
Avoid several excessive per-frame LLView::getChildView calls by instead caching the results in postBuild. (Added CachedUICtrl, which is basically just a self-nulling pointer to not have to make ui ctors dirtier)
2012-08-03 20:51:53 -05:00
Shyotl
ef601d3345
Implemented a hash-map for first-level children of ui elements. First-level child lookups are prolificly abused on a per-frame basis, and a plain old loop with a string comparison each iteraton was somewhat of a hotspot. (The recursive loop after is even more expensive, however)
2012-08-03 13:20:26 -05:00
Shyotl
d9e5601e10
Manually vectorized some of the UI vertex operations.
2012-08-03 13:12:02 -05:00
Shyotl
c385133c84
Fixed noisemap not binding for the nightvision shader.
2012-08-03 13:10:16 -05:00
Damian Zhaoying
b91a670c05
some spanish language files fixes
2012-08-03 14:13:19 -03:00
Drake Arconis
c90c8e0f4b
OpenID
...
Added support into client for openid
2012-08-03 11:32:36 -04:00
Damian Zhaoying
0a8cd6d03d
Merge remote-tracking branch 'upstream/master'
2012-08-03 11:05:30 -03:00
Drake Arconis
af89351432
Cookies.
...
Enabled use of the cookie store.
2012-08-03 08:49:01 -04:00
Drake Arconis
fb81754880
STUPID TEMP FILES
2012-08-02 23:29:12 -04:00
Drake Arconis
dc5bfc1c41
Bit of cleanup
...
More cleanup and updates to llcommon
Removed legacy code and files
2012-08-02 23:19:07 -04:00
Aleric Inglewood
98c740f204
Remove debug output
2012-08-03 00:56:41 +02:00
Aleric Inglewood
255742db26
Merge branch 'curlthreading2' into breakforce
2012-08-03 00:54:12 +02:00
Aleric Inglewood
af4ceb0658
Crash on exit fix.
2012-08-03 00:53:54 +02:00
Aleric Inglewood
08d72b12ab
Fix compilation on linux. Remove trailing ^M's
2012-08-02 23:03:03 +02:00
Aleric Inglewood
5fb4badb7c
WIP
2012-08-02 22:34:23 +02:00
Siana Gearz
4650636e5a
Use TCP socket pair instead of UDP
2012-08-02 22:33:01 +02:00
Lirusaito
2c65da3397
Make viewer_manifest.py smarter.
...
Use newlines as delimiter to avoid strange characters and spaces breaking xargs.
2012-08-02 15:50:20 -04:00
Lirusaito
abc1d185b7
Gemini keywords update.
2012-08-02 10:22:01 -04:00
Lirusaito
124eba4371
Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/strings.xml
2012-08-02 10:18:17 -04:00
Damian Zhaoying
a673496ed3
Update Spanish Translation, All files translated and up to date
2012-08-02 09:08:57 -03:00
Drake Arconis
af2a49afa7
Fixed linux64 libpng copying
2012-08-02 05:39:02 -04:00
Drake Arconis
b151796e0e
Updated LSL Funtions
...
Updated the functions, constants, tooltips, etc for os,aa, and secondlife
2012-08-02 05:38:23 -04:00
Drake Arconis
828b2c9bc0
Merge remote-tracking branch 'shyotl/master' into AltCompilers
2012-08-01 21:41:36 -04:00
Lirusaito
be8b838334
Make new Posterize Effect fit in with the cleaned look of post-process floater.
2012-08-01 09:21:38 -04:00
Lirusaito
73fedf453c
Compile fixies~
2012-08-01 09:13:40 -04:00
Lirusaito
e03de192c8
Merge branch 'future' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvovolume.cpp
2012-08-01 06:48:42 -04:00
Aleric Inglewood
725cdc2d69
Linux compile fixes
2012-07-31 23:04:45 +02:00
Siana Gearz
048c57cf0c
Linktime fix
2012-07-31 22:40:20 +02:00
Siana Gearz
12dcbfbc79
Merge remote-tracking branch 'aleric/breakforce' into breakforce
2012-07-31 22:39:48 +02:00
Aleric Inglewood
32be05fa6c
Compile warning fixes. Type fix (SLL -> SSL)
2012-07-31 22:37:49 +02:00
Aleric Inglewood
ae62b67554
Merge branch 'curlthreading2' into breakforce
2012-07-31 22:24:57 +02:00
Aleric Inglewood
29908533cd
More work in progress
2012-07-31 22:23:52 +02:00
Siana Gearz
9c4f22d85b
Attempt at fixing linker errors...
2012-07-31 21:30:05 +02:00
Siana Gearz
7f64668e55
Compile warning fix
2012-07-31 21:29:22 +02:00
Siana Gearz
0208942b84
Compile warning fix
2012-07-31 21:28:37 +02:00
Siana Gearz
783e86990c
Compile fixes
2012-07-31 19:42:15 +02:00
Aleric Inglewood
cdefc0e384
Merge branch 'curlthreading2' into curlthreading3
...
Conflicts:
indra/llmessage/llcurlrequest.cpp
Header file include changes collided. Fixed.
2012-07-31 17:46:07 +02:00
Lirusaito
1c9f996248
Make "Autorespond to people you have muted" an independent toggle for that type of autoresponse.
...
Trivial fix to carry users along, not needing to autorespond to anyone in order to autorespond to mutes.
I was working on a complete rewrite months ago, I have to dig that up, even still this system needs to be redone, ground up.
2012-07-31 03:37:10 -04:00
Aleric Inglewood
c9715c5b0b
Print Dout() and DoutEntering() debug output on windows.
...
This is a bit of a hack currently and requires a
recompile with -DDEBUG_CURLIO.
2012-07-31 04:57:13 +02:00
Aleric Inglewood
dd47123bde
Add possibility to suppress function name prefix in debug output.
...
Adds llinfos_nf et al.
2012-07-31 04:56:03 +02:00
Lirusaito
594dc64a43
Made Post-Process Settings floater far better looking
2012-07-30 11:03:20 -04:00
Lirusaito
1b69994ffa
Respect graphics requirements for FBOs and Hardware Skinning in graphics preferences, properly.
2012-07-29 22:25:41 -04:00
Aleric Inglewood
3de21156b5
Windows code improvements and debugging.
...
Extended the DEBUG_WINDOWS_CODE_ON_LINUX hack to include ALL code.
memset-zero sockaddr_in, and use WSASocket as per suggestion of Shyotl.
2012-07-30 02:46:48 +02:00
Aleric Inglewood
ce2c6ab49e
Don't crash when libcurl wasn't compiled with support for libz
2012-07-30 02:45:39 +02:00
Aleric Inglewood
d19c5a4a4a
Move apr_os_thread_current_wrapper closer to where it's used, and fix a comment.
2012-07-30 02:44:51 +02:00
Aleric Inglewood
8945fe4857
Unbreak standalone install on 64bit linux
2012-07-30 01:47:27 +02:00
Aleric Inglewood
464919072d
Use LLBufferArray instead of std::stringstream for CurlResponderBuffer::mInput
...
Note the changed code is never used yet. CurlResponderBuffer::curlReadCallback
is only called when Request::post is being used, which is never used.
2012-07-29 22:52:20 +02:00
Siana Gearz
f8c2087d74
Preliminary Windows support for curlthreading
2012-07-29 22:47:19 +02:00
Siana Gearz
7adc0e24ab
Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading
2012-07-29 21:32:24 +02:00
Aleric Inglewood
ba65f29a72
Fix draining of wake up pipe.
...
This is a bug fix, although not one we'd ever run into as normally
there is always just one byte to read, never an EAGAIN and certainly
never more than 256 bytes. Anyway, also those cases should work now.
2012-07-29 21:12:45 +02:00
Aleric Inglewood
76eef6fe59
Avoid crash on exit.
2012-07-29 18:38:59 +02:00
Shyotl
1d1947c51a
Reworked LLPostProcess and implemented FBO support (much faster if multiple post shaders are enabled, or need a lot of passes).
...
Tweaked LLRenderTarget to support depth textures if FBO support is lacking.
Prefer LLRenderTarget::getFBO() over LLRenderTarget::sUseFBO when determining how to handle a specific LLRenderTarget object. (Decoupling to simplify logic without having to track a global)
2012-07-29 04:28:11 -05:00
Aleric Inglewood
af4ac8fb5f
WIP: work on rewriting LLURLRequest
2012-07-29 01:30:11 +02:00
Aleric Inglewood
adaf5cd69c
Update of a few <edit> comments.
...
While comparing this function with v-d, I realized that
I editted these instances for Singularity, so I might
as well update the <edit> comments to be a bit more correct.
Not saying that there aren't other <edit> comments
still missing futher into the function.
2012-07-29 01:30:11 +02:00
Aleric Inglewood
516f5a40d0
Change mainloop to no longer use gIdleCallbacks
2012-07-29 01:30:11 +02:00
Aleric Inglewood
3b7887a041
Cleanup of some unnecessary dependencies.
2012-07-29 01:30:11 +02:00
Aleric Inglewood
fe38f59bbb
Bug fix
2012-07-29 01:30:10 +02:00
Aleric Inglewood
cd93aba002
Created aistatemachine library and moved files.
2012-07-29 01:30:10 +02:00
Siana Gearz
2bcabce1d6
Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading
2012-07-28 17:28:18 +02:00
Siana Gearz
6ed9a62501
Disable texture auditing at start-up
2012-07-28 16:56:19 +02:00
Lirusaito
b987c025db
Update to notifications.xml, fix for Sound upload missing a string.
...
Notifications brought up to date from V-D, Tazy, and a few touchups of my own.
Added notification for status_SeeAVs from upstream, and hooked it into our icon.
Strings update from Tazy.
2012-07-28 07:49:04 -04:00
Lirusaito
27d8d100c5
Fix for log file name with datestamp checkbox on Comm Prefs Panel never enabling, and thus being intangible.
...
Also, enable local chat loggings by default.
2012-07-27 12:55:13 -04:00
Shyotl
701230b49c
Added LLRenderTarget::resize and did a little cleanup.
2012-07-26 03:05:22 -05:00
Shyotl
726d8248c5
Trying alpha-face rebuild using LL's method.
2012-07-26 00:17:38 -05:00
Shyotl
07a2c5a81d
Use glFramebufferTexture2D to detach textures from FBOs before said textures are 'deleted'(set to NULL via zeroing dimensions). May avoid odd LLImageGL::deleteTextures crash on some apple systems.
2012-07-25 23:12:26 -05:00
Shyotl
081ae32d35
Disable diagnostic fmodex stream allocation overrides. (will break on ogg streams. badly.)
2012-07-25 23:08:37 -05:00
Lirusaito
a7f02b3964
Migrate LLFloaterHardwareSettings into a tab in LLPanelDisplay
...
Still not translated, left the old translated floaters for easier translation.
New Hardware Tab is work in progress, it should be more populated in the future, but is fine for now.
2012-07-25 18:11:48 -04:00
Lirusaito
e116548b50
Allow more flexible perm controls, from item properties floater.
...
TODO: Bring these permission flexibilities into build floater's general tab.
2012-07-25 09:19:22 -04:00
Lirusaito
3190814265
Made AntiSpam better
...
AntiSpamNotify setting to turn off notifications, which seemed to become a new form of spam, otherwise.
Add tool_tips to UI explaining how to make the system less sensitive.
Made defaults for antispam a lot less sensitive, so users used to the old antispam defaults won't likely need to configure the new panel.
Pull in license from NaCl... (Why wasn't it already there, Ruby?!)
Fixed spaces being where tabs should be...
Added in selective Dialog disabling, instead of just all, nice little feature in itself.
Potentially fixed a bug where sounds would be blocked when they shouldn't be... but, if this still happens, I'll put in a debug setting to disable sound antispam.
2012-07-25 09:03:41 -04:00
Shyotl
eeea2b4de4
Don't batch faces that are animating, ever (hopefully). Should fix texture animations breaking when rendermaxtextureindex > 1
2012-07-24 20:18:35 -05:00
Shyotl
21f6174846
Use glFramebufferTexture2D to detach textures from FBOs before said textures are 'deleted'(set to NULL via zeroing dimensions). May avoid odd LLImageGL::deleteTextures crash on some apple systems.
2012-07-24 11:27:23 -05:00
Aleric Inglewood
ed4c6b7c92
Removed dead code.
...
This code has been in the viewer source for a long time,
and hasn't been used for a long time (furtherest back that
I checked was Snowglobe 1.4).
Most notably, this removes LLContextURLExtractor and code
that used it because that required an API where AICurlEasyHandle
is created before an url is known, which gets in the way of
reusing connections.
2012-07-23 18:15:11 +02:00
Siana Gearz
89be317a00
Fix measurement tool
2012-07-23 14:18:45 +02:00
Siana Gearz
1ad4597d7a
Fix alpha flicker when Show Updates is enabled
2012-07-23 12:00:33 +02:00
Siana Gearz
c65b659538
Dirty potential mesh crash fix
2012-07-23 10:50:05 +02:00
Siana Gearz
3c23163a29
Less intrusive notifications, by Tazy Scientist
2012-07-23 09:54:00 +02:00
Siana Gearz
c3900ee4f3
Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer
...
Conflicts:
indra/newview/llvieweraudio.cpp
2012-07-23 09:03:17 +02:00
Siana Gearz
9c5da9e42c
Build fixes VC10
2012-07-23 08:13:13 +02:00
Drake Arconis
efa970c6a5
Uhm..
...
This fixes a build issue temp till can rebuild QT...*sigh*
2012-07-22 23:41:09 -04:00
Siana Gearz
179f04739d
Merge commit 'c7bdaf66329b018159c834d75fcc3d807b188ccb'
2012-07-23 05:10:56 +02:00
Siana Gearz
b2f513caae
Safer settings, EOL fix
2012-07-23 04:02:20 +02:00
Siana Gearz
9c1e74b0c0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llstreamingaudio_fmodex.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
2012-07-23 03:04:33 +02:00
Siana Gearz
e53af58d4a
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-07-22 23:31:19 +02:00
Siana Gearz
d9cb2ce6c7
Looks like a bit of edit crash fix got missed, thx Drake
2012-07-22 23:30:41 +02:00
Siana Gearz
a967f2b037
Updated 'Show Updates'
2012-07-22 22:36:40 +02:00
Siana Gearz
db5a7578c9
Crash fix copy texture params
2012-07-22 21:44:41 +02:00
Siana Gearz
15086833a3
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
Aleric Inglewood
785729abdf
Merge branch 'master' into curlthreading2
2012-07-22 04:17:34 +02:00
Shyotl
32f407340f
Call LLImageGL::initClass to avoid crash when calling LLFeatureManager::applyRecommendedSettings. (texauditing vectors must be allocated)
2012-07-21 21:16:41 -05:00
Aleric Inglewood
2830b35aa6
Avoid dead lock in LLQueuedThread::generateHandle / LLTextureFetchWorker::callbackDecoded
...
Thead 1:
indra/llcommon/llqueuedthread.cpp:456:
452 if (complete)
453 {
454 lockData(); // This locks LLThread::mRunCondition
455 req->setStatus(STATUS_COMPLETE);
456 req->finishRequest(true);
LLImageDecodeThread::ImageRequest::finishRequest calls:
mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux);
LLTextureFetchWorker::DecodeResponder::completed calls:
worker->callbackDecoded(success, raw, aux);
LLTextureFetchWorker::callbackDecoded calls:
LLMutexLock lock(&mWorkMutex); // This locks LLTextureFetchWorker::mWorkMutex
Thread 2:
LLTextureFetchWorker::doWork calls:
LLMutexLock lock(&mWorkMutex); // This locks LLTextureFetchWorker::mWorkMutex
.
.
.
mDecodeHandle = mFetcher->mImageDecodeThread->decodeImage(mFormattedImage, image_priority, discard, mNeedsAux, new DecodeResponder(mFetcher, mID, this));
LLImageDecodeThread::decodeImage calls:
handle_t handle = generateHandle();
LLQueuedThread::generateHandle calls:
lockData(); // This locks LLThread::mRunCondition
2012-07-22 04:13:23 +02:00
Aleric Inglewood
fb38f6adea
Always write curl I/O debug info for the login attempt.
2012-07-21 21:51:24 +02:00
Shyotl
a1e714dce7
mDeferredVB only needs allocated when rendering in deferred mode. mCubeVB only needs allocated when occlusion is working. Let them be lazy-allocated on an as-needed basis.
2012-07-21 03:43:30 -05:00
Shyotl
3710ea903e
Enable texture auditing categories, also fixed potential buffer underread related to auditing.
2012-07-21 03:27:43 -05:00
Drake Arconis
72a9b6b7fe
Corrected issues
...
Corrected issue noted in media_plugin_webkit by Aleric.
Grr.
2012-07-21 03:23:02 -04:00
Drake Arconis
0d3fab40e5
Further header cleanup and a few updates
...
Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
2012-07-21 03:01:42 -04:00
Aleric Inglewood
3a30f1dc71
This is called when LLApp::sStatus == LLApp::APP_STATUS_STOPPED too.
2012-07-21 03:57:58 +02:00
Shyotl
95abf3dca3
Merge branch 'master' into future
2012-07-20 12:12:07 -05:00
Shyotl
4e4d554ea4
Silence the diagnostic llinfos spam when listening to a stream.
2012-07-20 12:11:30 -05:00
Shyotl
9642780bb8
Merge branch 'master' into future
...
Conflicts:
indra/llaudio/llstreamingaudio_fmodex.cpp
indra/llaudio/llstreamingaudio_fmodex.h
2012-07-20 12:07:10 -05:00
Shyotl
73bc656e63
Flexis were not being reliably initialized before being drawn.
2012-07-20 12:04:24 -05:00
Shyotl
b8b235df09
And suddeny the texture index attrib(for batching) is now an integer! (Changing switch to an if block on nividia hardware seems like the real solution to pink textures... not the index datatype)
2012-07-20 12:03:41 -05:00
Shyotl
7b23aece00
Missed a couple LLCullResult::drawable_list_t -> LLCullResult::drawable_iterator replacements, albeit in #if'd out code blocks.
2012-07-20 11:37:01 -05:00
Shyotl
531af998fb
MAINT-775: Fix for particle index pool corruption on teleport. (And removed alternative workaround) https://bitbucket.org/davep/viewer-development/changeset/04fdf7945708
2012-07-20 11:29:11 -05:00
Lirusaito
c7bdaf6632
Merge branch 'AltCompilers' of https://github.com/LightDrake/SingularityViewer
2012-07-20 10:50:40 -04:00
Lirusaito
92c7792e95
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml - Resolved to the eye's pleasure.
2012-07-20 10:41:25 -04:00
Shyotl
c9e0a6c533
MAINT-1270: Fix for some flexi prims becoming flat at some LoDs. https://bitbucket.org/davep/viewer-development/changeset/47f0d08ba7ad
2012-07-20 08:55:02 -05:00
Shyotl
6331267df6
MAINT-646: Optimize LLVolumeImplFlexible::doIdleUpdate() https://bitbucket.org/davep/viewer-development/changeset/b0148737d316
2012-07-20 08:54:25 -05:00
Drake Arconis
1e81966b89
Clean up and updates
...
Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files
/\_..._/\
|/ \_/ \|
| o.-.o |
\ ( O ) /
/'--U--'\
| .:. | /\
| /:;:\ |` /
Drake | |:;:| |-'
Arconis / |'-'| \
`""` `""`
2012-07-20 08:13:07 -04:00
Shyotl
b785b9d219
Added 'Transparent Water' checkbox to graphics panel, as we actually have space for it now.
2012-07-20 05:15:47 -05:00
Shyotl
85da7163a7
Changing the rolloff settings now immediately apply (with fmodex). Also added AudioLevelUnderwaterRolloff now that the underwater rolloff 3d setting doesnt immediately get clobbered. Also, divvied up sound channels into channelgroups if using the fmod profiler, so it actually has useful info to show now.
2012-07-20 04:00:02 -05:00
Lirusaito
f3f8bee83b
Remove old spam stuffs, Clean up new spam stuffs to compile, UI new spam stuffs.
2012-07-19 23:40:07 -04:00
Siana Gearz
8802d5033f
Merge branch 'master' into curlthreading
...
Conflicts:
indra/newview/viewer_manifest.py
2012-07-20 00:37:58 +02:00
Siana Gearz
3d39564605
Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading
2012-07-20 00:35:43 +02:00
Drake Arconis
7843f51110
Merge remote-tracking branch 'singu/master' into AltCompilers
2012-07-19 17:51:18 -04:00
Drake Arconis
8bfdc98ef4
Improvements!
...
Fixed Boost library to not throw warnings
Changed PNG cmake slightly
Updated 32lib package for correct locations
Cleaned up flags a bit for linux64
2012-07-19 17:44:19 -04:00
Ruby
6673c89791
Add Antispam code from NaCl (Chalice Yao)
...
Amended by: Lirusaito <inusaito@gmail.com >
2012-07-19 16:36:39 -04:00
Siana Gearz
a8a30ae3b9
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-19 22:19:52 +02:00
Lirusaito
15af410e6f
Fix typo in outbox icon name, when closed.
2012-07-19 14:02:11 -04:00
Aleric Inglewood
9e5cbf330f
Bug fix for windows code found with previous commit.
2012-07-19 17:28:45 +02:00
Aleric Inglewood
2fa9334090
Debug code to test the windows code path on linux
2012-07-19 17:27:37 +02:00
Aleric Inglewood
fcdf5d377e
Move PollSet out of the header file
2012-07-19 17:26:02 +02:00
Shyotl
756a284048
Don't ever halt stalled fmodex streams, as they don't seem to truly 'stall'. Decrease delay between leaving starvation and unmuting down to 1 second (from 5).
2012-07-19 02:32:16 -05:00
Lirusaito
32e2b584b9
Translation Fix
2012-07-19 02:12:51 -04:00
Lirusaito
add52b4d57
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2012-07-18 23:41:23 -04:00
Siana Gearz
a4d2cb3d12
Some fighting with Shyotl over FMOD Ex
2012-07-19 05:35:17 +02:00
Lirusaito
72fbb3f63e
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-07-18 22:58:52 -04:00
Siana Gearz
c62290accb
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-07-19 04:46:15 +02:00
Siana Gearz
8ad40c5d66
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llaudioengine_fmodex.cpp
2012-07-19 04:44:01 +02:00
Lirusaito
cd5a721c23
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-18 22:31:53 -04:00
Shyotl
643844c01d
GCC being GCC-ey. Fix a couple errors and warnings
2012-07-18 21:27:46 -05:00
Shyotl
1a3c9ac5ef
GCC being GCC-ey. Fix a couple errors and warnings
2012-07-18 21:27:02 -05:00
Lirusaito
c84f080fc8
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-18 22:08:06 -04:00
Shyotl
5fcdbfdd9e
FMODEx diagnostics.
...
SHFMODExStreamBufferSize added. Determines stream buffer size in ms. (stream restart required)
SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream restart required)
Streams will mute themselves if they are starving, until they are free of starvation for 5 full seconds.
Streams that fail to accumulate any buffer progress while starving for 10 full updates will be stopped.
Stream buffer progress(buffer percent) is llinfos spewed every update. (temporary)
Doubled default stream buffer size
Increased default decode buffer size to 1000ms (from 400)
Temporarily using FMOD::Memory_Initialize to display raw stream/decode buffer sizes via llinfos.
Added llwarns messages for SigmaTel hardware or bad audio acceleration configuration.
2012-07-18 21:05:24 -05:00
Shyotl
77dca2ddb2
FMODEx diagnostics.
...
SHFMODExStreamBufferSize added. Determines stream buffer size in ms. (stream restart required)
SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream restart required)
Streams will mute themselves if they are starving, until they are free of starvation for 5 full seconds.
Streams that fail to accumulate any buffer progress while starving for 10 full updates will be stopped.
Stream buffer progress(buffer percent) is llinfos spewed every update. (temporary)
Doubled default stream buffer size
Increased default decode buffer size to 1000ms (from 400)
Temporarily using FMOD::Memory_Initialize to display raw stream/decode buffer sizes via llinfos.
Added llwarns messages for SigmaTel hardware or bad audio acceleration configuration.
2012-07-18 21:04:21 -05:00
Shyotl
d8fc691625
MAINT-646: Hotspot in LLViewerObjectList::update
2012-07-18 20:26:43 -05:00
Siana Gearz
96fa4af939
Initialize FMOD Ex with 44100 Hz, like FMOD
2012-07-19 03:26:02 +02:00
Siana Gearz
2334793554
Build SLPLugin.exe without tcmalloc, for SkyDrive
2012-07-19 03:24:44 +02:00
Lirusaito
20e445b4be
Added icons for folders from phoenix, and created outbox folder icon for future use.
2012-07-18 20:26:19 -04:00
Aleric Inglewood
051263117d
Don't force TLS v1 unless needed and then warn about it.
2012-07-19 00:13:43 +02:00
Lirusaito
085db93fc8
menu_inventory.xml translations update.
...
Brought the French up to date, translations on my own..
Brought the Spanish up to standard.
2012-07-18 16:04:12 -04:00
Damian Zhaoying
8fe6925414
New Spanish Translations
2012-07-18 15:30:03 -03:00
Damian Zhaoying
57ad7e62d2
Merge remote-tracking branch 'upstream/master'
2012-07-18 08:57:45 -03:00
Shyotl
6736e91ce0
MAINT-1147: Don't rebuild volume meshes on region crossing. https://bitbucket.org/davep/viewer-development/changeset/0f20bb7cb9ee
2012-07-18 03:09:16 -05:00
Shyotl
4cbdb7897d
MAINT-646: Knock out some extraneous performance timers. https://bitbucket.org/davep/viewer-development/changeset/71673401390a
2012-07-18 03:08:47 -05:00
Shyotl
d57d0ceb0d
MAINT-646: Vectorize LLPolyMesh https://bitbucket.org/davep/viewer-development/changeset/668dcacd6e76
2012-07-18 03:04:12 -05:00
Lirusaito
03608103b8
Tiny French Translation update
...
~Thanks Nomade~
2012-07-18 03:57:07 -04:00
Shyotl
9c58d42a3c
MAINT-646: Don't spend so much time fetching avatar physics params. https://bitbucket.org/davep/viewer-development/changeset/b895285ab0de
2012-07-18 02:40:41 -05:00
Damian Zhaoying
675d171104
Merge remote-tracking branch 'upstream/master'
2012-07-18 03:16:39 -03:00
Shyotl
bf3e605d3b
MAINT-646: Factor std::vector out of lloctree https://bitbucket.org/davep/viewer-development/changeset/efcec3eb374f
2012-07-18 01:03:54 -05:00
Shyotl
a56ad597d4
MAINT-646: Factor std::set out of lloctree https://bitbucket.org/davep/viewer-development/changeset/52b6c9168974
2012-07-18 00:54:52 -05:00
Shyotl
cc5ffafd7c
MAINT-646: Add a lookup map for joints to remove hotspot in LLJoint::findJoint https://bitbucket.org/davep/viewer-development/changeset/15b05dc53770
2012-07-17 23:54:10 -05:00
Shyotl
b101bb0001
MAINT-646: Faster traversal of render batch lists. https://bitbucket.org/davep/viewer-development/changeset/38b7779af5f9
2012-07-17 23:38:34 -05:00
Lirusaito
405af67f45
Merge branch 'AltCompilers'
2012-07-17 22:30:48 -04:00
Aleric Inglewood
f772cbee51
Don't crash upon exit if we fail to cleanup.
2012-07-18 03:13:33 +02:00
Shyotl
72d93b8723
Merge branch 'V2MultiWear'
2012-07-17 19:46:56 -05:00
Aleric Inglewood
7f78870295
Merge remote-tracking branch 'siana/master' into curlthreading2
...
Conflicts:
indra/llcommon/llstring.cpp
indra/llmessage/llcurl.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/viewer_manifest.py
install.xml
Resolved:
indra/llcommon/llstring.cpp :
two different ways to work around compile error.
indra/llmessage/llcurl.cpp :
this file is no longer used.. I deleted huge
parts to mark that I implemented that. Siana
apparently made a few changes in those parts.
indra/newview/llviewertexturelist.cpp :
manually copied patch. Mine also removed trailing
spaces, keeping that.
indra/newview/viewer_manifest.py:
Collision with changes from Liru, which have been
ignored (kept siana/master).
install.xml:
Collision with an earlier screw up. I kept the
fix from siana/master.
2012-07-18 02:08:31 +02:00
Aleric Inglewood
706b9c55c2
Moving stuff around a bit...
2012-07-18 01:41:36 +02:00
Shyotl
48ae0d003d
Made the Visual Studio compiler a bit more happy with aicurl.
2012-07-17 18:04:48 -05:00
Damian Zhaoying
51c5933b76
Merge remote-tracking branch 'upstream/master'
2012-07-17 19:49:33 -03:00
Aleric Inglewood
0204d09a89
If curl thread is already awake, then don't write something to the pipe.
2012-07-17 23:39:44 +02:00
Lirusaito
465c6b9ed6
Bring back ASCENDED_DEVELOPER, and give it extra meaning!
2012-07-17 16:42:43 -04:00
Drake Arconis
39847c4688
Merge remote-tracking branch 'liruhub/master' into AltCompilers
2012-07-17 16:08:10 -04:00
Drake Arconis
7721c6e3da
Resolved issue with glibc 2.16
...
Resolved issues introduced by changes made in glibc 2.16 removing the undocumented definition of struct siginfo from bits/siginfo.h
2012-07-17 16:06:31 -04:00
Aleric Inglewood
648ed00ce2
Don't call gSavedSettings.getU32() and calc_clock_frequency() so often anymore.
2012-07-17 19:58:34 +02:00
Aleric Inglewood
87c9358813
Add back erroneously removed comments.
2012-07-17 19:33:12 +02:00
Aleric Inglewood
64b968b262
process is no longer processing
2012-07-17 19:27:14 +02:00
Lirusaito
c0fbf4bf55
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2012-07-17 12:17:32 -04:00
Aleric Inglewood
900e533b4b
Remove unused call to process().
2012-07-17 08:01:06 +02:00
Damian Zhaoying
01818582cf
Merge remote-tracking branch 'upstream/master'
2012-07-16 21:07:25 -03:00
Lirusaito
9a0620f140
Add Voodoo to tags.
2012-07-16 19:33:44 -04:00
Drake Arconis
0216925e05
Merge remote-tracking branch 'siana/master' into AltCompilers
2012-07-16 17:20:57 -04:00
Drake Arconis
32b24a98ca
Merge remote-tracking branch 'shyotl/V2MultiWear' into AltCompilers
2012-07-16 17:20:47 -04:00
Drake Arconis
93d7a4938a
Merge remote-tracking branch 'liru/master' into AltCompilers
2012-07-16 17:19:58 -04:00
Drake Arconis
56265b78ec
Merge remote-tracking branch 'liru/V2MultiWear' into AltCompilers
2012-07-16 17:19:45 -04:00
Lirusaito
6ee76aa6f7
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-07-16 17:11:44 -04:00
Lirusaito
32d6aefe00
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer
2012-07-16 17:10:01 -04:00
Lirusaito
84795863e5
Translations updated
...
Updated French Translation from Nomade's Zip for MultiWear.
Updated Translations to use basically the same format, and not have some cruft.
Abouts updated to include Spanish translators: Damian Zhaoying, and Franxizco Romano.
2012-07-16 17:07:22 -04:00
Aleric Inglewood
9deb3e433c
LLCurlRequest time out fixes.
...
Also some more cleanup on exit improvements.
2012-07-16 22:35:04 +02:00
Drake Arconis
92a5b14347
Linux64 libs and fixes
2012-07-16 16:10:15 -04:00
Siana Gearz
891a330955
Version 1.7.0
2012-07-16 12:19:22 +02:00
Shyotl
3cee90fe8b
Lets not call glDeleteTextures any more, since the glGenTextures/glDeleteTextures paradigm has gone away.
2012-07-16 01:00:55 -05:00
Drake Arconis
2bb58bac2e
Corrected annoyance and inconsistencies for OSX
2012-07-15 23:32:12 -04:00
Damian Zhaoying
9dc1897b35
Fix English Inventory UI To translate other languages
2012-07-15 23:56:58 -03:00
Drake Arconis
7a7da24df5
Merge remote-tracking branch 'shyotl/V2MultiWear' into AltCompilers
2012-07-15 22:22:01 -04:00
Shyotl
46f7250f08
Fixup multisample rbos. Samplecount validation all done in LLMultisampleBuffer::allocate, and falls back to non-multisample safely if multisampled rbos cannot/shouldn't be used.
2012-07-15 21:12:31 -05:00
Drake Arconis
58bfe23e5a
Merge remote-tracking branch 'shyotl/V2MultiWear' into AltCompilers
2012-07-15 17:46:51 -04:00
Drake Arconis
ccb914ea83
General cleanup of OSX support - not done
...
Updated with new cursors from LL
Corrected mispackaged OSX Libs
Corrected mouse flicker on menus
Signed-off-by: Drake Arconis <lightdrake@gmail.com >
2012-07-15 17:45:50 -04:00
Shyotl
10fe67f4a6
FBO tweaks. Release multisample fbo in LLPipeline::releaseScreenBuffers, and fixed LLRenderBuffer::mInternalFormat falling out of sync with LLRenderBuffer::mTex.
2012-07-15 16:41:31 -05:00
Aleric Inglewood
a34247ebf4
Bug fix.
...
Don't test on something that belongs in an assert.
is_main_thread() doesn't even exist unless --type=Debug.
2012-07-15 23:08:07 +02:00
Aleric Inglewood
53e96b02c0
Bug fix. Forgot to actually make it virtual.
2012-07-15 22:59:29 +02:00
Aleric Inglewood
7c022d6061
Don't crash on exit.
...
When a new state machine was just created, so run() had already
been called but it never did really run yet so running() would
return false; then abort() wasn't called in flush(), causing
the subsequent mainloop call to actually try and startup the
state machine, which then crashed because Debug Settings
mechanism is already destroyed at that point (and in general,
we really don't want anything to run: it does unpredictable
things).
With this fix, also state machines that were just created are
aborted, resulting actuall in a kill without delete, and subsequently
a clean delete from the mainloop.
2012-07-15 22:51:14 +02:00
Aleric Inglewood
14e5b46687
Fixed and adjusted remainders of isValid() code.
...
Note that in the code, and still, has_curl_request was always false.
However, instead of deleting all code paths that are only executed
when has_curl_request would be true, I fixed the code to work as
intended with my current implementation; which also results in
LLCurlRequests to never expire. This way things won't break
unexpectedly when this ever changes.
Since on this branch isValid was only called still (the rest was
removed already) to check if the curl download expired, I took
the liberty to rename isValid to hasNotExpired.
2012-07-15 22:46:38 +02:00
Lirusaito
0243c61ea1
Spanish Translation is complete, add it to the completed combo_box area, and keep to alphabetical order.
2012-07-15 15:23:53 -04:00
Lirusaito
d73d4e9d48
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-07-15 15:10:40 -04:00
Lirusaito
3d60d9e3c5
Merge branch 'V2MultiWear' of https://github.com/DamianZhaoying/SingularityViewer
2012-07-15 15:10:09 -04:00
TighMacFanatic
329b708aaf
Fix History button in IM panel not working for non-Windows users.
2012-07-15 15:07:05 -04:00
Lirusaito
59e0367dd4
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-07-15 14:52:46 -04:00
TighMacFanatic
56c85813ee
Fix History button on local chat not working for non-Windows users.
2012-07-15 14:25:10 -04:00
Aleric Inglewood
a6bb2604f6
Use our API, which makes more sense.
2012-07-15 16:58:47 +02:00
Aleric Inglewood
b2c71c099f
Fixed typo in comment
2012-07-15 16:57:47 +02:00
Drake Arconis
102eca7d65
Merge remote-tracking branch 'siana/master' into AltCompilers
2012-07-15 10:37:06 -04:00
Lirusaito
55a1d54b8e
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-07-15 09:56:04 -04:00
TighMacFanatic
0c313807ff
Merge branch 'master' of https://github.com/siana/SingularityViewer
2012-07-15 05:56:19 -04:00
Siana Gearz
d5e685aaf2
Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer
2012-07-15 09:44:17 +02:00
TighMacFanatic
214fc0419d
Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer
2012-07-15 00:01:53 -04:00
Lirusaito
1e24b889dd
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer
2012-07-14 21:47:43 -04:00
Shyotl
08dd79fafd
Recent occlusion changes rearing their head again. Fix a crash when graphics set to low.
2012-07-14 20:42:47 -05:00
Lirusaito
988e2c3fdf
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer
2012-07-14 20:47:27 -04:00
Lirusaito
92dc20850d
Added Terrain Scale ComboBox to graphics preferences panel.
...
Fixed up feature tables to use correct names, and to use the 7 for high TerrainScale.
2012-07-14 20:45:59 -04:00
Shyotl
fa9c366076
Fixed alpha textures not entering the alpha pool an alternative way.
2012-07-14 19:45:11 -05:00
Shyotl
08ab36a5d9
mPendingInventoryItemsIDs wasn't having entries removed.
2012-07-14 19:44:06 -05:00
Siana Gearz
c1c04b489c
Revert "Possible fix for "No able to connect to SecondLife""
...
This reverts commit 66c95af093 .
2012-07-15 02:29:00 +02:00
Siana Gearz
0caa321fe5
Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer
2012-07-14 22:02:06 +02:00
Lirusaito
3acaf773b8
Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer
2012-07-14 16:01:06 -04:00
Lirusaito
5080746fa0
Prevent build preferences from altering objects we've duplicated. Offer an off switch for build prefs.
...
Added LiruEnableBuildPrefs, for turning off, when users do not want to use their default build parameters for a few prims, but don't wish to reset them permanently.
This should perhaps end up on the build floater somewhere... but for now, debug only.
Note some of this fix for duplication may be overly cautious, but better safe than sorry.
Added a check for physical default in during creation, so that building at great distances adheres a bit more to build preferences.
Added IsCOA into the build settings, since I'd forgotten, previously.
2012-07-14 15:54:36 -04:00
Aleric Inglewood
66c95af093
Possible fix for "No able to connect to SecondLife"
2012-07-14 20:57:55 +02:00
Aleric Inglewood
9241816a71
Include linden_common.h first. Needed for libcwd.
2012-07-14 20:04:55 +02:00
Drake Arconis
07e1f0e802
Added a terrain texture scale changer thing!
...
Need someone to add UI bits though >.<
2012-07-14 05:04:10 -04:00
Drake Arconis
340f8f1f17
MORE WINDLIGHTS!
2012-07-14 05:02:44 -04:00
Drake Arconis
0316b7ff9a
OSX libwork
...
Started on osx libwork will need darwin builder to test
2012-07-14 04:10:09 -04:00
Aleric Inglewood
7416d2aaf1
Timer, time out, and clean up improvements.
2012-07-14 04:29:37 +02:00
Siana Gearz
cb61342e58
Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer
2012-07-13 13:45:02 +02:00
Siana Gearz
d99de40b2b
Suppress error prevalent on OSGrid
2012-07-13 13:44:46 +02:00
Lirusaito
533675416c
Merge branch 'V2MultiWear'
...
Conflicts:
indra/newview/app_settings/settings.xml - Removed SinguMuteGestures, since it's EnableGestureSounds now.
~removed in llviewermessage.cpp as well.
2012-07-13 05:44:38 -04:00
Damian Zhaoying
8baceee06c
Add Spanish Translation
2012-07-13 06:23:37 -03:00
Lirusaito
f7bf5c33bc
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-12 17:43:53 -04:00
Shyotl
f8445030c7
Avoid making duplicate copies in item inventory when no-mod texture is dragged onto faces.
2012-07-12 16:33:05 -05:00
Shyotl
1d60131df7
Avoid switch statement in shaders on nvidia hardware, since some driver versions don't behave properly, apparently..
2012-07-12 16:25:27 -05:00
Shyotl
539b6410fa
Brought back the inventory item count display after loading has completed.
2012-07-12 16:09:42 -05:00
Lirusaito
75f067d5c9
Added crossfade checkbox to Windlight remote panel.
2012-07-12 13:35:56 -04:00
Lirusaito
518e9b7513
Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-12 12:40:41 -04:00
Siana Gearz
0314bb4d38
Apparently Laika Tungsten's name is nhede Core
2012-07-12 18:34:49 +02:00
Siana Gearz
ddfe004204
Restore function of day cycle editor
2012-07-12 18:33:10 +02:00
Siana Gearz
07375e7a39
Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llrender/llvertexbuffer.h
2012-07-12 08:30:35 +02:00
Lirusaito
44b69f3d3e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h Chose Shyotl's.
2012-07-11 23:23:31 -04:00
Shyotl
bca4cf8584
Revert LLs recent VBO alterations, as they aren't proving to be all that great..
2012-07-11 17:13:37 -05:00
Shyotl
4f3f503953
Recreate mDeferredVB on vertexbuffer reset.
...
Shuffled some code from LLVOPartGroup::restoreGL() to LLVOPartGroup::destroyGL(), as it makes more sense there.
Bind the correct shader in wireframe..
glLineStipple call managed to sneak into no-fixed-function mode.
LLViewerWindow::initFonts was called frequently and redundantly during destroygl->restoregl transition.
2012-07-11 17:12:40 -05:00
Lirusaito
1df635a164
Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-11 12:44:41 -04:00
Siana Gearz
f3ae5789be
Fix mute in voice
2012-07-11 18:43:31 +02:00
Lirusaito
cf7cd21474
Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-11 12:37:37 -04:00
Lirusaito
0f8fbcfcc1
Disallow the user from self-muting and remove them from the mutelist if this was the case.
...
Works around other viewers allowing the user to mute themself.
2012-07-11 10:47:40 -04:00
Siana Gearz
a1f9109392
Don't try to HTTP inventory fetch when we can't
2012-07-11 14:54:20 +02:00
Siana Gearz
c648be6410
Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer
2012-07-11 07:38:58 +02:00
Lirusaito
6fa0b668ba
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer into V2MultiWear
2012-07-10 19:51:45 -04:00
TighMacFanatic
1925b24512
Fix "Enable highlighting of selected prims" so it actually does something.
2012-07-10 19:48:11 -04:00
Drake Arconis
1101b4075a
Merge remote-tracking branch 'siana/master' into AltCompilers
2012-07-10 14:16:24 -04:00
Drake Arconis
edb144bd1d
Fixed ugly workaround for compiler detection
...
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
2012-07-10 14:15:59 -04:00
Drake Arconis
bcefad1a97
Massive windlight preset cleanup and updates
...
Cleaned up all duplicate windlight presets
Renamed windlight presets under correct current prefixes
Imported new presets from FS and Alchemy
2012-07-10 14:14:31 -04:00
Siana Gearz
fe65e19b67
Fix wind on multichannel systems
2012-07-10 15:08:20 +02:00
Siana Gearz
1b6ef97f45
Windows build fix
2012-07-10 14:55:16 +02:00
Siana Gearz
ce0e0a2d38
Fix editing artifact from about floater fudging
2012-07-10 14:17:18 +02:00
Siana Gearz
e7aeffc271
Our trusty perftools
2012-07-10 14:11:02 +02:00
Lirusaito
648766ad44
Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-10 03:40:09 -04:00
Lirusaito
176c91097a
Renamed DisableWindAudio to MuteWind and made it actually work
...
This will give Windows(only?) users experiencing the problem with wind sound corruption a way out.
2012-07-10 00:52:02 -04:00
Siana Gearz
515b1488c6
Bumping the cache version
2012-07-10 06:14:07 +02:00
Siana Gearz
6868e2f7c1
Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer
2012-07-10 06:07:56 +02:00
Siana Gearz
c71c7ca7cc
Make defaults less rude to others
2012-07-10 05:50:47 +02:00
Siana Gearz
2f743fe2ce
About floater fixup, new contributors!
2012-07-10 05:36:07 +02:00
Siana Gearz
b19c284eb7
Make void water subdivision tunable
2012-07-10 05:34:50 +02:00
Aleric Inglewood
0419f8bee9
Add an AITimer to AICurlEasyRequestStateMachine.
...
Fixes AIStateMachine to work thread-safe with the timer.
2012-07-10 05:09:08 +02:00
Siana Gearz
18638cd47c
Fix assertion on shutdown if haven't logged in
2012-07-10 00:55:26 +02:00
Lirusaito
23e6c9c9e8
Revert "One more DARWIN fix."
...
This reverts commit 6581cb2929 .
2012-07-09 18:49:27 -04:00
Lirusaito
fa9c48a376
Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear
...
Conflicts:
indra/cmake/00-Common.cmake
2012-07-09 18:45:00 -04:00
Drake Arconis
a67fe755cd
Fixed line endings
...
Fixed the line endings of the windlight files to unix
2012-07-09 12:32:34 -04:00
Aleric Inglewood
f012f664d2
Threading voodoo: allow multiple concurrent calls to set_state().
...
This patch prepares AIStateMachine for the use of AITimer together
with calls to set_state() from other threads. The extra problem
in this case is that the main-thread CAN start running the state
machine again (when the timer times out), while before it was
assumed to be idle until a thread called set_state.
This also takes into account that a thread might call set_state()
and then AGAIN call set_state() before the main thread gets the
chance to call idle() inbetween.
2012-07-09 04:19:28 +02:00
Lirusaito
80e44fe414
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-08 20:05:17 -04:00
Shyotl
42c7a30280
Attempt to dodge some known vbo issues (VAO quriks, and VBO mapping being wonky). Will investigate the issues further, soon.
2012-07-08 19:04:33 -05:00
Shyotl
e9ec04a449
Added french translations for several recently added LLTrans string lookups.
2012-07-08 18:45:05 -05:00
Drake Arconis
f7d9cd1b8e
Fixed jsoncpp
2012-07-08 19:33:44 -04:00
Drake Arconis
5cc687f5dc
Merge remote-tracking branch 'siana/master' into AltCompilers
2012-07-08 19:11:04 -04:00
Siana Gearz
e7f8206c96
Merge branch 'AltCompilers'
2012-07-09 00:22:44 +02:00
Lirusaito
6581cb2929
One more DARWIN fix.
...
Credit to LightDrake and Apelsin
2012-07-08 17:57:06 -04:00
Lirusaito
b8f7e193d6
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-08 17:10:44 -04:00
Shyotl
95b0421074
Inviting avatar to group via profile now adds that avatar to subsequent group invitation popup more reliably.
2012-07-08 16:09:10 -05:00
Lirusaito
1228732432
Fix for compile error caused by compiler type not being defined on DARWIN.
...
and stop compiling dsa/dhparam, we don't use these.
2012-07-08 17:08:11 -04:00
Lirusaito
191787e5c3
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-08 11:28:47 -04:00
Lirusaito
ca07daebc7
Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer into V2MultiWear
2012-07-08 11:28:31 -04:00
Lirusaito
8ec8acf610
Added Build preferences, like Emerald's. Exposed UI for giving an item with autoresponse
...
Pulled LLDropTarget into its own files and brought in the callback version so we can use either, whereever we need them, without rewriting them.
This makes code for drag and drop items into boxes easier.
--------Auto-Response--------
Added item box to Adv. Chat, finally you can send autoresponse with item!
Taught to LLViewerMessage to understand this.
------------Build------------
Added in comment labels for more sections of system preferences.
Everything new in the System->Build tab will reset on cancel, except the item, I see no reason to reset an item.
Added in BuildPrefs, and settings like them.
Taught LLToolPlacer how to give creations material type, and size, and ask importtracker to do the rest.
LLViewerObjectList now pings importtracker whenever it notices newly created objects that are ours entirely, so we can exact our will upon them.
Cleaned up most of importtracker code so we can use only the parts we need, and do it well.
Added ObjectPhysicsProperties to message.xml
2012-07-08 11:20:56 -04:00
Drake Arconis
cb0f4f8f10
Added support for Intel c++ Composer Xe
...
Added support for building with Intel C++ Composer Xe
Fixed a warning thrown by it
2012-07-08 10:29:28 -04:00
Siana Gearz
e7a49da774
Correct the parting line between void water patches with shaders
2012-07-08 06:27:50 +02:00
Siana Gearz
81123a80f2
Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer into AltCompilers
2012-07-08 03:34:20 +02:00
Siana Gearz
045caad8f5
Revert "REVERT! Fix for media update commit."
...
This reverts commit 36a95ec36e .
2012-07-08 03:33:05 +02:00
Siana Gearz
a76a77a330
Merge branch 'V2MultiWear' into AltCompilers
2012-07-08 00:51:29 +02:00
Siana Gearz
81242f1b5e
Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-08 00:34:38 +02:00
Siana Gearz
36a95ec36e
REVERT! Fix for media update commit.
2012-07-08 00:31:18 +02:00
Aleric Inglewood
744563a150
Use a newer libcurl version for linux.
2012-07-07 23:22:48 +02:00
Aleric Inglewood
389074d1e9
Fail at configure time when openGL is not found
2012-07-07 23:17:22 +02:00
Aleric Inglewood
93778eccbb
Compile fix for g++ 4.7
2012-07-07 18:29:55 +02:00
Aleric Inglewood
5637e89568
Fix for libcwd that is already in curlthreading2.
2012-07-07 14:49:37 +02:00
Drake Arconis
4508ea1cc1
Fixup from last commit
...
*grumble* Stupid git gui broke my commit!
Fixed a warning in llpaneleditwearables.cpp
2012-07-07 00:35:46 -04:00
Shyotl
2e073f7449
Fixed an annoying discard level assertion that was being fired.
2012-07-06 23:24:00 -05:00
Lirusaito
6b11776fcf
Added in Phoenix's building preferences: removed bloat and waste, made positioning less fragile, repositioned parts more sensibly, and suggested courses of action in comments.
2012-07-06 14:45:39 -04:00
Lirusaito
58ff4a00f1
Some very good points Voodoo had, and some things I noticed and had to correct.
2012-07-06 12:14:55 -04:00
Drake Arconis
525e9d9a8e
Webkit plugin updates
...
Updated the webkit plugin with the latest features
Fixed SSL support in webkit
Other minor cleanup
2012-07-06 11:37:45 +00:00
Drake Arconis
b40a9c7a06
Updated about floater
...
Moved the licensing to its own tab
Updated and added relevant copyright notices
2012-07-06 09:12:42 +00:00
Drake Arconis
0b757aaad5
Merge remote-tracking branch 'liru/V2MultiWear' into AltCompilers
2012-07-06 01:54:57 +00:00
Drake Arconis
7f1d9a01e6
Merge remote-tracking branch 'siana/AltCompilers' into AltCompilers
2012-07-06 00:04:07 +00:00
Aleric Inglewood
f46d8e8a10
Try to be smart about not printing garbage (binary) received from the server.
2012-07-05 23:50:03 +02:00
Siana Gearz
d1b6b78206
Fixing windows build
2012-07-05 22:38:24 +02:00
Drake Arconis
d8c191490f
OK HAPPY? ITS FIXED
...
MY GOD RAGE RAGE RAGE RAGE RAGE AND MOAR RAGE
Yes I know this looks stupid.
Really.
2012-07-05 14:19:37 +00:00
Drake Arconis
24ec85febd
Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer into AltCompilers
2012-07-05 14:04:17 +00:00
Drake Arconis
9565d96006
Fixed a typo in repackage.sh
...
So. I was tired and that happened.
2012-07-05 14:03:53 +00:00
Drake Arconis
822098b5ac
Fixed a typo in repackage.sh
...
So. I was tired and that happened.
2012-07-05 13:44:44 +00:00
Drake Arconis
02ae36b427
OpenSSL Updated.
...
OpenSSL 1.0.0g
2012-07-05 12:59:50 +00:00
Siana Gearz
f5bfab139c
Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading
2012-07-05 06:06:04 +02:00
Drake Arconis
259a9ff0cc
Cleanup and more library work
...
Cleaned up unneeded files in LICENSES already provided by the
prebuilt packages themselves
install.xml:
Added in pcre, colladadom, and windows glod library
Corrected, descriptions licenses, and copyrights.
2012-07-05 02:43:37 +00:00
Drake Arconis
d238cfe753
LibraryWork: Windows Libraries
...
Repacked the windows libraries for new package layout.
Cleaned install.xml of unused libraries on windows.
Cleaned install.xml of unused libraries on darwin.
Repacked windows gperftools from Kitty/Catznip.
Updated windows openal.
2012-07-05 02:08:27 +00:00
Aleric Inglewood
df20f918ba
New libcwd channel 'curlio'.
...
Enable printing of libcurl 'IO' debug messages when libcwd channel
'curlio' is turned on (added to .libcwdrc). Avoiding a recompile.
2012-07-05 03:10:16 +02:00
Aleric Inglewood
b8fc1f634e
Print the curl library found during configure.
...
Prints something like:
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so (found version "7.25.0")
2012-07-05 01:41:01 +02:00
Aleric Inglewood
ae9dadb5d8
Improved layout of curl stats print out.
2012-07-04 16:56:33 +02:00
Siana Gearz
d31c062693
Fix building with libcwd
2012-07-04 12:44:05 +02:00
Drake Arconis
31ca817dc0
Removed ReleaseSSE2
...
Removed ReleaseSSE2 and moved its options under Release.
2012-07-04 10:25:04 +00:00
Siana Gearz
544928a039
Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading
2012-07-04 10:45:48 +02:00
Siana Gearz
30f49526db
Stray settings be gone
2012-07-04 10:44:37 +02:00
Aleric Inglewood
14276b3cf8
Bug fix
2012-07-04 08:44:22 +02:00
Lirusaito
b194d9e012
Sync llpaneleditwearable to Shyotl/V2MultiWear version.
2012-07-04 02:02:50 -04:00
Aleric Inglewood
07e7eeedd1
Added some windows code.
...
Iterating directly over the elements of fd_set::fd_array in
windows is faster than using FD_ISSET.
2012-07-04 07:32:24 +02:00
Drake Arconis
5748de1f9d
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
Drake Arconis
d0c1c4d753
Dos2Unix line endings and a file mode change
2012-07-04 00:29:59 +00:00
Drake Arconis
7af331c50d
First set of changes for new librarys and lib layout support!
...
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
2012-07-04 00:26:42 +00:00
Aleric Inglewood
125a10bb44
Code hardening, review, bug fixes, documentation, curl stats and cleanup.
...
Bug fixes:
AICurlEasyRequestStateMachine didn't delete itself.
curl_multi_socket_action calls were made for potentional removed sockets.
The curl thread wasn't terminated.
2012-07-04 00:10:43 +02:00
Lirusaito
de26fff525
Changed "Mesh Detail" to "Level of Detail" so people don't see it as "Mesh"
...
Also added in an Advanced button, but it's commented out as it does not function properly, and someone else should code it..
Builds on the previous commit of graphics prefs..
2012-07-03 14:44:13 -04:00
Drake Arconis
9db7bcde00
Why or why ugly hack :/
2012-07-03 17:33:37 +00:00
Lirusaito
ca9c99577f
Removed exportFileXML, and importXML, updated indra/test's
...
and generally updated cpp's to V-D look(include order, spelling fixes, and whatnot)
Also, commented out pointless using namespace std.
2012-07-03 10:07:14 -04:00
Lirusaito
b0c28c5eb2
Updated Graphics Preferences, Fixed display resolution combobox not disappearing
...
Now includes Ambient Occlusion and looks more like V3,
and yay everything finally disappears that should nao~
2012-07-03 09:55:19 -04:00
Lirusaito
ded9d1027b
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-03 08:44:10 -04:00
Aleric Inglewood
9b8e5c8719
Merge branch 'V2MultiWear' into curlthreading2
...
I picked a few non-curl related patches from curlthreading2
and applied them to V2MultiWear. Now merging back to avoid
collisions for others.
2012-07-03 14:27:12 +02:00
Siana Gearz
8a271b9621
HTTP texture fix - the brutal and inefficient way -.-
2012-07-03 13:40:32 +02:00
Siana Gearz
c5f9e8cf68
Revert "HTTP texture fetch endless append fix, by Laika Tungsten"
...
This reverts commit b4bdb7ca36 .
2012-07-03 13:17:01 +02:00
Lirusaito
4e2af85770
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
2012-07-03 01:57:55 -04:00
Siana Gearz
5a685febbf
Certificate update
2012-07-03 07:51:03 +02:00
Siana Gearz
cd2dc2f3ca
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/app_settings/settings.xml
indra/newview/llface.cpp
2012-07-03 07:49:22 +02:00
Lirusaito
9c61998dac
Spelling fixes...
...
to a header *sigh*
2012-07-03 00:54:25 -04:00
Lirusaito
509340237c
Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear
2012-07-03 00:51:43 -04:00
Drake Arconis
fc3436a8d1
*grumble*
2012-07-03 04:48:30 +00:00
Drake Arconis
41983b7f27
A bit of cleanup and fixes
2012-07-03 04:45:53 +00:00
Lirusaito
a9494d1fb0
Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear
2012-07-02 23:42:38 -04:00
Drake Arconis
608417ba6b
Corrected line endings of XML files
2012-07-03 03:32:18 +00:00
Drake Arconis
c5d19cca0b
Finished dead code patrol and cleaned up remnants of long dead feature
2012-07-03 03:31:24 +00:00
Lirusaito
4435e7ade3
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-02 21:28:19 -04:00
Drake Arconis
f79a16ef0f
Cleanup of long dead code
2012-07-03 01:10:41 +00:00
Drake Arconis
947990c2ad
Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers
2012-07-03 00:34:07 +00:00
Aleric Inglewood
e36042bb76
More that I forgot it extract from curlthreading2.
2012-07-03 02:33:09 +02:00
Drake Arconis
cb5474c291
Cleanup and simplication of cmake logic in 00-Common.cmake
2012-07-03 00:31:06 +00:00
Drake Arconis
77948b8ce4
Fixed further warnings reported by clang.
2012-07-03 00:24:15 +00:00
Drake Arconis
2ac4f81424
Prefer FmodEx as the default audio engine if the viewer was built with it.
2012-07-03 00:22:50 +00:00
Drake Arconis
7ad1b8731d
Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers
2012-07-02 21:25:40 +00:00
Aleric Inglewood
d66acdf240
Add the rest of sRunning too.
2012-07-02 23:22:42 +02:00
Drake Arconis
8eb319d3ba
Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers
2012-07-02 21:08:04 +00:00
Drake Arconis
d703b4e076
Further tweaking cmake
2012-07-02 21:04:53 +00:00
Shyotl
9ddbc132bf
View->Build menu selection now functions once more.
2012-07-02 15:38:38 -05:00
Drake Arconis
c464a8da30
Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers
...
Conflicts:
indra/cmake/00-Common.cmake
indra/newview/llvovolume.cpp
2012-07-02 20:16:56 +00:00
Lirusaito
e6689f830a
Update llstring, and fix an error only presented in debug builds.
2012-07-02 15:57:55 -04:00
Drake Arconis
ece9dda7b4
Initial support for the Clang compiler and numerous warning fixes
2012-07-02 19:45:41 +00:00
Lirusaito
361c69edd9
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-02 15:35:26 -04:00
Shyotl
d0668d818c
Cmake was setting a certain preprocessor definition when it shouldn't have been(Because I made a silly mistake).
2012-07-02 14:30:28 -05:00
Lirusaito
24db228406
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
indra/newview/llpaneleditwearable.h
2012-07-02 04:14:52 -04:00
Shyotl
53a570b977
Push drawables into priority queue when their textures change number of components. (Quick and dirty fix for alpha faces not being placed into alpha pool until some other irrelivant rebuild state is set)
2012-07-02 00:50:55 -05:00
Aleric Inglewood
a803507d67
Use correct way to check if we logged in yet or not.
...
Without this fix, we trigger an assert, in debug mode, that was added
to Singularity exactly to find out if we called functions like
getExpandedFilename(LL_PATH_PER_SL_ACCOUNT ...) before logging in.
Checking if THAT function returns empty() is clearly not safe, but
very error prone.
2012-07-01 22:15:03 +02:00
Shyotl
4ba1509371
Texcache tweakage.
2012-06-30 20:07:52 -05:00
Shyotl
399d93cc36
Compiler fixes and a crashfix.
2012-06-30 20:06:48 -05:00
Shyotl
67e1a3b004
Lindie viewer-dev catchup regarding rendering pipeline.
2012-06-30 20:05:31 -05:00
Aleric Inglewood
cb5efad026
Turn llassert[_always] into a (single) statement and print line nr in decimal.
2012-06-30 21:14:18 +02:00
Aleric Inglewood
26922a1578
Merge remote-tracking branch 'lirusaito/curlthreading2' into curlthreading2
2012-06-29 05:28:58 +02:00
Aleric Inglewood
90493b6571
Add support for libopenSSL older than version 1.0.0.
2012-06-29 05:20:24 +02:00
Aleric Inglewood
2dee921cd5
Fix libcurl version check.
2012-06-29 01:33:38 +02:00
Lirusaito
433c7c3f99
Spelling fixes and stuff like that to AICurl* and llproxy.* documentations
...
Also removes a duplicate include from llares.cpp
Conflicts:
indra/llmessage/aicurl.cpp
2012-06-28 04:08:25 -04:00
Lirusaito
fef461fd13
Grabbed openSSL-1.0.0d from upstream for linux, necessary for non-standalone compiles.
...
Also brought in linux64 version I had sitting around, collecting dust.
2012-06-28 03:46:22 -04:00
Aleric Inglewood
1f56645b69
Always set proxy settings for every HTTP curl connection.
...
Move applyProxySettings to CurlEasyRequest and call it from
applyDefaultOptions.
Use AIThreadSafe for LLProxy for a more robust threadsafeness.
(This forces correct locking, checks that the unshared vars
are indeed unshared and made it easy to use read/write locking,
which might be important in this case (we do a lot of read-only
accesses to it).
2012-06-28 05:56:21 +02:00
Aleric Inglewood
69ca6cd5b2
WIP: Make curl thread code robust and flexible.
...
Conflicts:
indra/llmessage/llcurl.cpp
indra/llmessage/llcurl.h
indra/newview/app_settings/settings.xml
indra/newview/llappviewer.cpp
indra/newview/llmeshrepository.cpp
Resolved:
indra/llmessage/llcurl.cpp:
Basically removed (not used anyway)
indra/llmessage/llcurl.h:
Basically removed (just includes aiculr.h now)
indra/newview/app_settings/settings.xml:
CurlUseMultipleThreads was remvoved.
CurlMaximumNumberOfHandles and CurlRequestTimeOut
are still in there, but unused at the moment.
indra/newview/llappviewer.cpp:
CurlMaximumNumberOfHandles and CurlRequestTimeOut
are unused at the moment.
indra/newview/llmeshrepository.cpp:
Lock mSignal always (is unlocked inside wait()).
Use mSignal lock to see if we are waiting; remove mWaiting.
Return false from the MeshFetch functions iff we have to retry
a HTTP fetch. Catch the error exception thrown by getByteRange
instead of using it's return value (always returns true
anyway).
2012-06-28 01:30:46 +02:00
Aleric Inglewood
221e3908b9
There is no need to use a pure virtual destructor, and doing so crashes libcwd when configured with --enable-alloc.
2012-06-27 04:27:09 +02:00
Aleric Inglewood
782091ff02
Print useful error when dlopen() return NULL on linux standalone.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
c02834b7e3
Use AIThreadSafeDC and _wat convention to simplify AIEvent.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
15fb0ac3aa
Allow AIStateMachine::cont() to be called from another thread for an idle statemachine.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
0bee4a922f
Make sure that sRunning <= number of threads with status RUNNING.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
5996ff1fa2
Fixed a comment.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
e7a3a150a7
Add AIThreadSafeBits::wrapper_cast to cast wrapped object back to wrapper class.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
3c2f0b551f
Remove old and never used LLHTTPAssetStorage
2012-06-27 04:27:07 +02:00
Aleric Inglewood
e9df867a21
Like the other AIThreadSafe* objects, disallow AIThreadSafeSingleThread copy/assign
2012-06-27 04:27:07 +02:00
Aleric Inglewood
4391614d6e
AIThreadSafe* update.
...
Updated/added documentation.
Removed AIThreadSafeWindowsHack that annoyed me (fix your compiler).
Don't use 'static' in anonymous namespace.
Use the AIThreadSafe*DC variants for default constructed objects,
as opposed to the AITHREADSAFE* macro's.
2012-06-27 04:27:07 +02:00
Aleric Inglewood
d63c54cb78
Allow AIThreadSafe*DC classes to be constructed with zero or one parameter.
...
Also, allow AIThreadSafeSingleThreadDC objects to auto convert
to it's underlaying type, to assign that type and to write it
directly to an ostream.
2012-06-27 04:27:07 +02:00
Aleric Inglewood
058720824d
Fixup of LLAtomic and LLThreadSafeRefCount
2012-06-27 04:27:07 +02:00
Aleric Inglewood
8f6dbfc399
Compile fix for standalone
2012-06-27 04:27:06 +02:00
Aleric Inglewood
eb7615ad57
Merge branch 'master' into V2MultiWear
2012-06-27 04:26:44 +02:00
Aleric Inglewood
7234e63ce1
Merge remote-tracking branch 'siana/master'
...
Conflicts:
indra/llrender/llvertexbuffer.cpp
Resolved: needed two casts for 64bit warning.
2012-06-27 04:10:20 +02:00
Lirusaito
5f98e24efe
Reduced AudioLevelWind default value in settings.
...
Wind shouldn't be so loud when standing still, what is LL thinking?
And Fixed spacing
2012-06-26 17:04:17 -04:00
Lirusaito
ebf66ebe9d
XML UI Enhancements
...
Added History Button to group conferences and group chats.
Added Inventory Expand All icon and button added to inventory floater.
Thanks to Naudia Nadezda for pointing out that these parts of UI just work.
2012-06-24 17:27:33 -04:00
Lirusaito
26810ff16a
Fixed up Keywords
...
Up to date definitions and reorganizations,
commented out constants that apparently don't exist.
Fixed Strings not highlighting by borrowing missing code from Phoenix.
Also, this fixes 1020 being treated as UnknownAltitude when not on SL grid
and cleans up the horrible tabbing/spacing mud in llfloateravatarlist.cpp
2012-06-24 01:52:56 -04:00
Lirusaito
48a2d0497b
Added Avatar Privacy icon
...
Was requested, borrowed from Phoenix.
2012-06-22 03:57:47 -04:00
Lirusaito
b02465822b
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-06-19 16:16:49 -04:00
Lirusaito
edcbec7b76
Updated lscript, a bit, to match upstream.
2012-06-19 16:16:39 -04:00
Shyotl
a8ebd6eebb
Fixed a nullptr that occasionally caused crashing on shutdown.
2012-06-19 14:31:03 -05:00
Shyotl
e6b6e8b282
Unbork lltabcontainer's clipping. Also made vertical tab scrolling actually work (apparently it hasn't in quite some time).
2012-06-19 14:30:13 -05:00
Lirusaito
56fb36bbfa
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-06-18 21:09:16 -04:00
Lirusaito
94eda3aa24
Compile fixies
2012-06-18 21:03:08 -04:00
Shyotl
a3e6e96869
Emerald physics cleanup. Removed unused cruft. Disabling by default since it never worked (although it does now if set to enabled).
2012-06-18 14:50:39 -05:00
Lirusaito
102565cd3e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/app_settings/settings.xml
2012-06-17 10:42:56 -04:00
Shyotl
b5535c9cc4
Fixed a couple formatting errors in menu_inventory.xml
2012-06-16 01:45:13 -05:00
Shyotl
dadfc059c7
Minor llxmlnode updated. Tracks line numbers and ostream format is a bit nicer.
2012-06-15 09:52:35 -05:00
Shyotl
4c45e9a9d1
Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.
2012-06-15 09:51:11 -05:00
Shyotl
3796a216d2
Removed a few old settings from settings.xml. Added absent RenderAutoHideSurfaceAreaLimit setting.
2012-06-15 09:09:58 -05:00
Shyotl
21f7df0dcc
Stuck a space between realname and legacy name so long names now are more likely to split between lines more elegantly.
2012-06-12 02:14:19 -05:00
Shyotl
5b4700a8ee
Added RenderAutoHideSurfaceAreaLimit setting, and tweaked hud rendering(lighting issues)
2012-06-12 02:10:22 -05:00
Shyotl
0286c8bf55
Small GCC fix.
2012-06-11 07:18:05 -05:00
Shyotl
a399580c84
Stale/unloaded textures apparently sticking around. SH-3074 would probably explain better, but the issue is restricted as per usual.
2012-06-11 07:12:58 -05:00
Shyotl
349006637e
LL has played with texture discard priority/bias. Giving it a trial here.
2012-06-11 07:04:02 -05:00
Shyotl
945c663359
Updated LLInventoryModelBackgroundFetch and LLInventoryModel(code migration)
2012-06-11 06:57:54 -05:00
Shyotl
6b1f5c388f
Merged baking process with v3 head. Hopefully alleviates some baking oddities pertaining innitial login.
2012-06-11 06:54:59 -05:00
Shyotl
57641db71b
Added 'Move Forward' and 'Move Back' to multi-worn clothing context menus.
2012-06-11 06:43:05 -05:00
Shyotl
891d6d3448
Interim work on appearance editor.
2012-06-11 04:54:54 -05:00
Lirusaito
fd59accf96
Correct path to launch_url.sh
...
Makes Open in External browser work in Linux (and Solaris, hypothetically.)
Nothing lives in etc/ of packaged, let's keep it that way.
2012-06-10 09:09:27 -04:00
Lirusaito
0e2ca65084
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-06-09 18:35:20 -04:00
Lirusaito
0ad533d94d
STORM-1870 and Have a space before old names in parentheses, like V3.
...
Also small fixes, some spelling, some important; synchronize with upstream a bit..
Jonathan Yap: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
2012-06-09 17:07:20 -04:00
Lirusaito
0d87d3dc1c
Brought in EXT-1399 (relates to wind sounds)
...
Modified EXT-1399 to allow falling from the sky wind. When one drops from great heights, they hear the wind rush past their ears.
2012-06-09 10:49:48 -04:00
Shyotl
5ce477c7cc
Removed redundant double-click-teleport logic.
2012-06-09 02:28:42 -05:00
Shyotl
1a217b23c6
SH-3065 Out-of-order operations on startup. http://hg.secondlife.com/viewer-beta/changeset/ecdfca07cbe3
2012-06-09 01:57:21 -05:00
Shyotl
bb8417d6be
Added some missing settings pertaining to marketplace features.
2012-06-09 01:50:50 -05:00
Shyotl
332c8f997c
Applied MAINT-862. Sounds not playing first time. http://hg.secondlife.com/viewer-beta/changeset/24a7281bef42
2012-06-09 01:50:14 -05:00
Shyotl
5228aa7029
Updated LLMeshRepoThread. Hopefully a little more reliable.
2012-06-09 01:48:01 -05:00
Siana Gearz
f38e8b1981
Merge branch 'V2MultiWear' of git://github.com/Lirusaito/SingularityViewer into V2MultiWear
2012-06-09 03:01:54 +02:00
Siana Gearz
ac2f3968c2
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-06-08 22:32:30 +02:00
Lirusaito
ab5fd28cef
Added InventoryOutboxMax* keys from upstream to settings.xml
...
Prevents catastrophes, such as asserts and errors and crashes, explosions and godzilla?
Also fixed some spacing flaws (may aid in diffs from upstream in the future)
2012-06-03 14:05:29 -04:00
Shyotl
fb1594535e
Intermediate step in refactoring appearance panel
2012-06-02 17:32:19 -05:00
Lirusaito
73c05eff77
Cherry-pick of 24a7281bef42 from viewer-development, also added missing AttachmentDrop to notifications.xml
...
simon@Simon-PC.lindenlab.com: MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.
2012-06-02 05:13:50 -04:00
Lirusaito
9835d3b27e
Fix for invalid initialization error
2012-05-31 01:01:50 -04:00
Lirusaito
20f138b31f
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-30 21:16:27 -04:00
Shyotl
b15f2d1a56
Some elements were being incorrectly blocked by others in the customize floater.
2012-05-30 19:14:45 -05:00
Shyotl
f04aabde96
Updated client tagging system. Client tags only looked up in opensim, and most logic pulled out into its own singleton.
2012-05-30 19:14:11 -05:00
Shyotl
063ce180d3
Fmodex stereo fallback wasn't done quite right.
2012-05-30 18:56:36 -05:00
Lirusaito
c6120cd283
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-28 05:18:20 -04:00
Shyotl
51a4e4960f
V3 merge. Added LLMainLoopRepeater repeater. Disabled FBOs for baking. Fixed typo in strings.xml. Setting ThrottleBandwidthKBPS was used in a few places that MainloopTimeoutDefault should have been. Better outdated driver detection for ATI hardware.
2012-05-28 03:59:19 -05:00
Lirusaito
f9e40aedce
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-23 19:30:41 -04:00
Shyotl
271883e737
'Voice Preferences->Device Settings' crashfix. (NullPtr)
2012-05-23 18:23:27 -05:00
Lirusaito
7b2c4034f1
Fix for STORM-1854: Linux Viewer crashes on startup after update to Fontconfig 2.9.0
...
Thanks to Johnnie Carling
https://jira.secondlife.com/browse/STORM-1854?focusedCommentId=325106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-325106
2012-05-23 16:46:53 -04:00
Lirusaito
58c58dc845
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-23 03:46:48 -04:00
Shyotl
61013dd2ab
Crashfix regarding LLViewerObject using released regions. V3 cherrypick.
2012-05-23 02:10:02 -05:00
Shyotl
a2649ceb5a
Stab at fixing deferred snapshots.
2012-05-22 23:37:50 -05:00
Shyotl
eb562c2470
Updated deferred rendering (STORM-1819 Ternary/Graded shadows)
2012-05-22 23:36:38 -05:00
Shyotl
ae0804beea
Trival V3 llmath merge.
2012-05-21 20:23:42 -05:00
Lirusaito
fa4ee55308
Nomade Zhao's 4 fixes for translation. Re: Issue 340
...
Conflicts:
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
2012-05-17 18:49:01 -04:00
Lirusaito
e729bd80ce
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-17 02:09:20 -04:00
Shyotl
9eda9ad462
GCC doing its thing (by being picky).
2012-05-17 00:47:00 -05:00
Shyotl
dbe50efc10
Added 'make outfit' back to appearance editor.
2012-05-16 23:25:01 -05:00
Shyotl
d1540040a8
Added extra callback registering methods to LLUICtrl
2012-05-16 23:22:57 -05:00
Shyotl
bf28ce4239
Few nullchecks, and fixed broken logic in LLPanelAvatar::canClose()
2012-05-16 12:06:05 -05:00
Drake Arconis
8192b547a8
Merge branch 'V2MultiWear' into v2mwArx
2012-05-15 10:37:55 -04:00
Drake Arconis
8dc0e16f0a
Modified wrapper script with new options for FMOD Ex
2012-05-15 10:37:33 -04:00
Drake Arconis
5a2d160ac4
Fixed FMOD Ex support under linux
2012-05-15 10:36:48 -04:00
Lirusaito
e20b383aa0
Small changes that seem to make clang happier.
2012-04-30 23:48:30 -04:00
Lirusaito
a82953d0d0
Few more GCC 4.7 fixes.
...
include unistd when not on windows.
2012-04-29 00:25:40 -04:00
Lirusaito
16c2235510
Fixed About Floater's background.
...
clear and transparent both refer to the same thing, code fix to reflect this.
2012-04-28 21:34:24 -04:00
Lirusaito
8e6063e7b9
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00
Lirusaito
4799899317
Fritigern's script updates, brought in!
...
Also more stray spaces removed with care~
2012-04-26 22:09:58 -04:00
Lirusaito
37d2e41618
Spelling fix.
...
appearance isn't spelled appearence
2012-04-25 05:00:02 -04:00
Lirusaito
fd183e01b5
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-24 21:33:52 -04:00
Shyotl
75ef768e7f
Fixed alternate buildtool modes not being selectable (texture, scale, etc)
2012-04-24 17:12:54 -05:00
Shyotl
35bd8d90be
Subpanels created through ui factorymap callbacks which also call LLUICtrlFactory::getInstance()->buildFloater in said callbacks (opposed to using the filename attrib due to that not supporting sub-factorymap callbacks) now get a position fixup determined by parents position attribs for that subpanel after being built.
2012-04-24 17:12:13 -05:00
Lirusaito
a5faea64d9
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-24 04:17:31 -04:00
Shyotl
e7649d8f1c
Avoid re-issuing LLPanel::postBuild() needlessly. Essential to avoid callbacks being double-registered to ui element signals (eg, LLOverlayBar::toggleMusicPlay was being called twice per click).
2012-04-24 03:11:10 -05:00
Lirusaito
3eccd251c0
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-22 21:36:59 -04:00
Shyotl
b3d91d816d
Diagnostic llinfos spewage for attachment process.
2012-04-22 19:45:07 -05:00
Shyotl
3cc37fb12b
LLAgentCamera update. Culled a bunch of dead code from llappviewer. Moved build-mode toggle off into lltoolmgr.
2012-04-22 19:42:37 -05:00
Shyotl
71a29e347e
Tweaked camera panning into appearance edit mode.
2012-04-22 12:52:25 -05:00
Shyotl
6b66c33b47
Killed some redundant code in customize floater.
2012-04-21 20:44:10 -05:00
Lirusaito
d03b7d052d
Added EnableGestureSoundsSelf to allow playing the user's gesture sounds even while EnableGestureSounds is false.
2012-04-21 14:02:11 -04:00
Lirusaito
640d9489cb
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-04-21 12:03:42 -04:00
Siana Gearz
3d40f96dfe
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-21 13:19:02 +02:00
Siana Gearz
817085c172
Probably antivirus-friendlier SLPlugin
...
To detour SetUnhandledExceptionFilter to a dummy function, don't use WriteProcessMemory which
is usually used for inter-process writes and debugging. Instead, use more common technique
based on VirtualProtect.
2012-04-21 13:15:03 +02:00
Siana Gearz
5ce00cecef
Fix crash in voice device set-up
2012-04-21 12:57:33 +02:00
Lirusaito
bb1d94ba0e
Fix ambiguous overload in llstartup.cpp so the viewer compiles on linux
2012-04-20 17:26:44 -04:00
Shyotl
5ba68ed763
Updated buy land floater a bit. Fixed a persistent shutdown crash. Updated texture Texture Console.
2012-04-17 18:44:41 -05:00
Shyotl
ee84500735
Added some cursory direct-delivery support.
2012-04-16 23:33:34 -05:00
Shyotl
275c85f482
Missed two shaders in earlier v3 merge.
2012-04-16 23:22:18 -05:00
Shyotl
f584cb3b3b
Updated drag and drop impl. Uses LLDictionary, and also IDs DnD operations.
2012-04-16 23:20:27 -05:00
Shyotl
5517266bda
Missing translation strings. (Need to bring the french strings.xml up to date too, at some point.)
2012-04-16 23:17:47 -05:00
Shyotl
59fdf3b6e1
V3 merge pt 2 / 2
2012-04-13 23:24:39 -05:00
Shyotl
e1d243272f
V3 merge part 1 / 2.
2012-04-13 22:39:39 -05:00
Shyotl
3bd9ffe135
Fixed an annoying snapshot assertion (would buffer overrun if assertions are disabled)
2012-04-13 22:17:19 -05:00
Siana Gearz
fd1896536e
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-04-12 19:35:28 +02:00
Shyotl
1d402bfe39
Verify vert attrib disable state if only running in non-fixed-function.
2012-04-12 10:37:37 -05:00
Shyotl
06068a0361
Disable FBOs on intel gpus running with pre-GL3.x drivers.
2012-04-12 10:36:28 -05:00
Shyotl
18ac23554f
Texturecache bugs! "cache_size -= entries[idx].mBodySize" must happen before removeEntry in LLTextureCache::purgeTextures, as removeEntry zeros "entries[idx].mBodySize". "mTexturesSizeTotal -= entry.mBodySize"; must happen before "entry.mBodySize = 0" in LLTextureCache::removeEntry because, well, duh.
2012-04-12 10:35:42 -05:00
Shyotl
b49ad1cd34
RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
2012-04-12 10:29:45 -05:00
Siana Gearz
01d6095242
Apparently overestimating j2c size is always a bad idea
2012-03-31 03:45:22 +02:00
Siana Gearz
7774fe7f04
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/lldynamictexture.cpp
2012-03-31 01:54:53 +02:00
Siana Gearz
29e308b5ca
Restore meshes and morphs and login menu width
2012-03-31 01:16:09 +02:00
Shyotl
e7bcf1e9ec
Modified LLUserAuth to use LLSD when parsing login response parameters. Will facilitate easy wholesale replacement with LLLoginInstance in the future.
2012-03-30 09:51:30 -05:00
Shyotl
0453971a85
Small tweak from v3 regarding texture scaling.
2012-03-30 09:46:54 -05:00
Shyotl
4da4d5fd50
Added missing notification entries for when DebugAvatarRezTime=TRUE
2012-03-30 09:45:28 -05:00
Shyotl
db4e36a99a
Moved Neck and Root attach/detach entries to empty pie slices in the 'Torso' sub-menu.
2012-03-28 23:04:58 -05:00
Shyotl
07ff467831
Neck and root attachment points had invalid group numbers.
2012-03-28 19:41:04 -05:00
Shyotl
86c65e492d
Use FBO for dynamic textures if possible. ( https://bitbucket.org/simon_linden/viewmaster/changeset/24cdc2fee3d9 )
2012-03-28 19:40:37 -05:00
Siana Gearz
4770e7724c
Whoopsie, forgot to commit a trivial merge fix
2012-03-29 02:03:46 +02:00
Siana Gearz
f05edda4f4
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloatermessagelog.cpp
indra/newview/llstartup.cpp
indra/newview/llviewermenu.cpp
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/menu_inventory.xml
2012-03-28 22:27:45 +02:00
Lirusaito
8805e3fb27
Nomade Zhao's 4 fixes for translation. Re: Issue 340
2012-03-28 00:00:42 -04:00
Lirusaito
64d8397ea5
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-03-27 19:48:05 -04:00
Siana Gearz
be9f3178c0
Fixies, missed files
2012-03-28 01:45:10 +02:00
Lirusaito
4d4496fc4d
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-03-27 19:29:24 -04:00
Siana Gearz
d86f67f818
In hindsight, not letting OpenJPEG to error out nicely was a bad idea.
2012-03-28 00:26:56 +02:00
Siana Gearz
3acf6dc001
Another stab at making textures work as they should
2012-03-27 16:23:55 +02:00
Lirusaito
af67342969
Merge branch 'master' of git://github.com/siana/SingularityViewer
...
Conflicts:
indra/llrender/llvertexbuffer.cpp
Also, reverts indra/newview/skins/default/xui/en-us/panel_audio.xml to before mute-gesture button (For now can be toggled through SinguMuteGestures debug setting)
2012-03-27 07:15:48 -04:00
Siana Gearz
ce1607cf17
Plugging the mesh crash - thanks FS team!
2012-03-26 22:58:05 +02:00
Siana Gearz
fee59e83b8
Fix size estimation
2012-03-26 19:53:04 +02:00
Siana Gearz
caaba76921
Firestorm workaround for alloc failure
2012-03-26 15:05:35 +02:00
Siana Gearz
70438fa06f
Catching up with Lindies part 3
2012-03-26 15:01:53 +02:00
Siana Gearz
3f0f955a76
Catching up with Lindies part 2
2012-03-25 10:47:20 +02:00
Siana Gearz
196e9d6c78
Unbreaking Ctrl+W the right way
2012-03-25 09:31:06 +02:00
Siana Gearz
459751f206
Catching up with Lindies part 1
2012-03-25 09:31:03 +02:00
Siana Gearz
2e5ea4f5a7
Fix proxy setting initialization
2012-03-24 16:19:14 +01:00
Lirusaito
d9cbd52ea8
Fix for compiler warning in LLVertexBuffer::setupVertexArray.
2012-03-23 22:45:55 -04:00
Lirusaito
8b25d44bcf
Replaced a tab with a space in XML so Windows doesn't show an awkward square there.
2012-03-23 17:21:50 -04:00
Lirusaito
3d6733bed8
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-03-23 17:20:04 -04:00
Siana Gearz
cd7331453a
Another avatar .llm update
2012-03-23 15:10:46 +01:00
Shyotl
3d6511f4e1
LLTextureCtrl now creates texture picker when clicked. (behavior if child element handled click was inverted)
2012-03-22 09:36:13 -05:00
Shyotl
5ce6f7eb7d
Pesky file manged to escape from previous commit.
2012-03-22 05:43:51 -05:00
Shyotl
90f12f1bb9
Removed some dead code. Refresh avatar textures upon entering customize. Disabled an old emerald hack that seems to contribute to baking issues-- will look into further if it indeed was a problem.
2012-03-22 00:56:10 -05:00
Siana Gearz
8334277838
Want ridiculously small viewer window? Here you go.
2012-03-22 06:03:05 +01:00
Siana Gearz
80e53ebb2b
Viewer tags kill adjustments
2012-03-22 05:37:38 +01:00
Siana Gearz
1e9e7d701d
fix for SH-2941: crash at LLCurl::Easy::~Easy() (Bao Linden)
2012-03-21 21:31:42 +01:00
Siana Gearz
a57ad256b5
Fix RLVa not to give viewer channel and version to anyone
2012-03-21 19:50:21 +01:00
Siana Gearz
b4bdb7ca36
HTTP texture fetch endless append fix, by Laika Tungsten
...
Please don't consider this ready yet.
2012-03-21 19:30:11 +01:00
Shyotl
6b5df7194a
Added LLInvFVBridgeAction, and modified inventory bridges to use utilize their respective specialized LLInvFVBridgeAction derived classes.
...
Disabled 'New Folder' option in the recent items panel.
Disabled all 'New *' options in worn items panel.
2012-03-21 02:26:11 -05:00
Shyotl
0fdab061b9
Some spring cleaning.
2012-03-21 02:22:27 -05:00
Shyotl
896f7f5b9b
Diabled 'first physics wearable' notice.
2012-03-21 02:18:54 -05:00
Siana Gearz
f885c8667b
This might be needed for OS X, Drake says
2012-03-20 06:41:10 +01:00
Shyotl
c07d90a2ba
Rename box now properly aligned in the inventory panel. Commented out some ascent stuff pertaining to drag and drop because, well, it seemed weird.
2012-03-19 23:32:48 -05:00
Siana Gearz
cc459cb582
Alison Alena's new avatar mesh weights
2012-03-20 04:02:49 +01:00
Siana Gearz
8b8fe82c8e
Correct facepalm in llmessage port
2012-03-20 03:17:37 +01:00
Lirusaito
c3f3db518b
Fixed Issue 340, multiple instances of same name breaking translation.
...
Applies to advanced chat preferences only.
2012-03-19 18:08:17 -04:00
Lirusaito
385ec62e53
Added scale_image="false" to all mute buttons.
...
This will allow the mute icons to retain their normal look,
with Shyotl's changes to the UI code.
2012-03-14 08:55:10 -04:00
Lirusaito
881524831f
Merge branch 'master' of https://bitbucket.org/Lirusaito/singularityviewer
2012-03-14 02:58:45 -04:00
Lirusaito
376be8b990
Spelling fix in a comment.
2012-03-14 02:53:44 -04:00
Aleric Inglewood
1023088c0d
Fix 64-bit compile warning.
2012-03-13 16:34:45 +01:00
Aleric Inglewood
b18bc08600
Add AIAccessConst, AISTAccess, AISTAccessConst, ...
...
Also added AIThreadSafeSingleThread, AIThreadSafeSingleThreadDC
and AITHREADSAFESINGLETHREAD
2012-03-13 16:32:10 +01:00
Siana Gearz
5d6b925823
We have persistent console and multi-instance settings and don't need them forced on debug builds
2012-03-12 19:54:44 +01:00
Aleric Inglewood
fffbda1b90
Add ASSERT_SINGLE_THREAD
2012-03-12 04:37:55 +01:00
Aleric Inglewood
8c721c4a69
Merge/collision fix.
...
Belonged in previous commit really.
2012-03-12 04:37:16 +01:00
Siana Gearz
21170e1e18
Fix build on Windows
2012-03-12 00:35:47 +01:00
Aleric Inglewood
87b8f6e076
Merge with siana/master. Resolved conflicts.
...
Conflicts: removal of trailing space (to be the same as
viewer 3) in one instance collided with a patch of Siana.
I had moved isSelfLocked.
2012-03-11 03:21:45 +01:00
Shyotl
406ff6872f
Removed some pointless console spewage, and resolved a crash in avatar picks panel.
2012-03-10 20:02:22 -06:00
Aleric Inglewood
52b4008968
Prepare synchronization with viewer-development.
...
Synchronization will be complete after viewer-development
gets my LLAPRPool and LLAPRFile patch that I'm currently
working on.
2012-03-06 23:10:43 +01:00
Aleric Inglewood
c1133cb932
Use LLAPRPool
...
apr_pool_t* should not be used anywhere, except where a comment
explicitely says it's ok. This one apparently sneeked in in the
meantime.
2012-03-06 17:04:05 +01:00
Siana Gearz
1db7221508
And of course i forgot to add some files
2012-03-06 09:11:36 +01:00
Siana Gearz
83a3bbb48e
Fixies from viewer-development
2012-03-06 09:01:01 +01:00
Siana Gearz
8b6f462d13
Wholesale update of llmessage to V3.2
...
Note that this removes message logger for now.
2012-03-06 07:31:15 +01:00
Shyotl
55e589375f
scroll-list column headers now work on single-click. Also improved focus handling for scroll-lists.
2012-03-05 18:30:36 -06:00
Siana Gearz
2b833129c5
Merge branch 'master' of /cygdrive/c/git/SingularityViewer
2012-03-05 19:36:29 +01:00
Siana Gearz
efd1b2bfa9
French translation update and file cleanup
2012-03-05 19:17:07 +01:00
Siana Gearz
5eb90ef9cd
Preference button to clear settings
2012-03-05 19:05:30 +01:00
Siana Gearz
edd1b4d8e7
Avoid crashes in skins by using proper intended filenames
2012-03-05 18:57:24 +01:00
Siana Gearz
b67fa864ff
First shot at fixing font fallback
2012-03-05 18:18:37 +01:00
Shyotl
d54c86e1df
UI polish (scrollbar focus, tearoff menus), plus drag and drop fix.
2012-03-04 23:15:53 -06:00
Siana Gearz
0a11f09918
Tiny fixies from Phoenix
2012-03-04 09:39:28 +01:00
Shyotl
2d75e8fda6
Added mouse_wheel_opaque attribute for scroll_list. Made several advanced submenus tear-off-able. Updated menu hover logic (removed MAX_MOUSE_SLOPE_SUB_MENU check) to make menus behave more predictably to cursor movement. Improved menu handling when it runs off of screen (and only uses vertical flip if menu item is in lower half of screen)
2012-03-03 22:11:53 -06:00
Shyotl
9f2b668424
Restore esc key behavior.
2012-03-03 04:31:06 -06:00
Shyotl
502b2d30d4
ScrollList crashfix (leftover ascent bug)
2012-03-03 04:30:15 -06:00
Lirusaito
96ddbf2a8b
Added scale_image="false" to the gesture mute button so it won't span the width of the button.
2012-03-03 01:38:53 -05:00
Shyotl
355883aa5c
Context menu appears for text-entry boxes. Temp workaround for shutdown crash. Removed extra 'Wear' entry from inventory context menu. Fixed separators not appearing in inventory context menu. mouse_opaque actually 'blocks' mouse events on occluded ui elements.
2012-03-02 23:30:57 -06:00
Shyotl
500135941a
Modernized lluictrl. Added LLViewModel. Fixed focus callbacks being called excessively. Updated LLButton, and implemented boost::signals2 to replace old callback handling.
2012-03-02 16:57:33 -06:00
Lirusaito
c2ee420917
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-03-01 18:16:39 -05:00
Siana Gearz
5f7f7b7d61
Unsegfault memory tracker on Windows
2012-03-01 23:38:48 +01:00
Siana Gearz
251b0fa5c0
Memory consumption in statistics floater
2012-03-01 13:49:47 +01:00
Siana Gearz
ab26e1008f
RLVa crash fix, thx Kitty!
2012-02-29 19:05:24 +01:00
Siana Gearz
ecc396219d
I can't shake the feeling that timesliced cache clearing is botched. Better safe, byebye.
2012-02-29 17:22:24 +01:00
Lirusaito
74a1ba0d1e
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-29 10:52:26 -05:00
Siana Gearz
a7d70878b7
Log threadcount together with memory
2012-02-29 16:03:11 +01:00
Siana Gearz
baad415f0d
Correcting broken link icon, killing unused files
2012-02-29 13:58:35 +01:00
Shyotl
fb10af2723
Reverted inventory search behavor to pre v2. (search is per-panel, not global to the inventory floater)
2012-02-28 18:46:54 -06:00
Lirusaito
0dc05a39e6
Use Ctrl-shift-D for creating a landmarks, instead, and fix previous misplacement of the shortcut.
2012-02-28 13:05:06 -05:00
Shyotl
2f632d3324
Worn items have bold text in inventory. Also made label text for worn items more legible.
2012-02-27 19:04:47 -06:00
Shyotl
2bf940e15d
Fixed up inventory filter. Basic folders now have an 'open' icon. Tweaked the indent size for inventory (looks a little nicer imo)
2012-02-27 02:53:12 -06:00
Siana Gearz
840cb29f84
potential voice crash fix
2012-02-25 17:18:02 +01:00
Shyotl
dcec1cb5f2
LLViewerWindow::handlePerFrameHover renamed to LLViewerWindow::updateUI. Migrated some code to LLViewerWindow::updateMouseDelta, but made no functional change. Use LLSelectMgr to look up selected textures for texture view (opposed to soon-to-be-removed llhoverview)
2012-02-24 20:18:46 -06:00
Shyotl
a066730acb
Added LLInitParam. Not yet plugged into xml parsing.
2012-02-24 20:16:33 -06:00
Lirusaito
72fe406f64
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-24 18:39:25 -05:00
Shyotl
a6a69caa4f
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloateropenobject.cpp
indra/newview/llinventorybridge.cpp
indra/newview/llviewerinventory.cpp
2012-02-24 13:21:59 -06:00
Lirusaito
90ac174260
Added Ctrl-D for creating a landmark
...
Most browsers use this for creating bookmarks, landmarks are pretty much
the same.
2012-02-24 14:07:58 -05:00
Siana Gearz
0bdf54e6d9
This fixes Copy+Wear from object
2012-02-24 03:27:24 +01:00
Siana Gearz
10af9d64f2
One day this will be a memory stat
2012-02-24 03:26:06 +01:00
Lirusaito
b555e02220
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-23 16:27:46 -05:00
Shyotl
5c66c70546
Display an arrow overlay on item links.
2012-02-23 14:31:43 -06:00
Siana Gearz
a76b0cb9da
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-23 18:51:49 +01:00
Aleric Inglewood
0450358df3
Clean up after Linden Lab
2012-02-23 18:50:28 +01:00
Siana Gearz
a632010b95
Boost: target Windows XP strictly
2012-02-23 15:35:50 +01:00
Shyotl
323ec8cf59
Updated customize floater to work with layer 0 wearable, for now.
2012-02-23 04:00:09 -06:00
Siana Gearz
a1038f3972
Merge git://github.com/LightDrake/SingularityViewer
2012-02-23 03:06:19 +01:00
Siana Gearz
93f6ea1a07
Pure linden boost on windows
2012-02-23 03:05:31 +01:00
Siana Gearz
d721fd65b3
Bugfix repackager
2012-02-23 03:03:15 +01:00
Siana Gearz
e207f2e025
Fix scroll buttons on dark skin
2012-02-23 02:29:59 +01:00
Shyotl
3d39e443fe
Append username to window title upon connecting to grid.
2012-02-22 17:51:06 -06:00
Lirusaito
507c94c24c
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-22 17:20:21 -05:00
Siana Gearz
be37d9b5a9
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-22 18:02:04 +01:00
Siana Gearz
e39327c017
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-02-22 18:01:45 +01:00
Lirusaito
2699fa8cf9
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer
2012-02-22 11:23:59 -05:00
Lirusaito
513002416c
Corrected text to say viewer's website, since we are not Imprudence.
2012-02-22 09:50:19 -05:00
Lirusaito
22530cd77e
Prevent snapshot resolution from going over window size, when showing UI or HUD in snapshots is enabled.
...
Otherwise snapshots do not have UI/HUD shown, despite enabling RenderUIInSnapshot or RenderHUDInSnapshot.
2012-02-22 09:23:09 -05:00
Lirusaito
81521b98fd
Added gesture_muted icon, reworked the panel_audio to look better, and have mute gesture look more like the rest of the panel.
2012-02-22 06:22:05 -05:00
Drake Arconis
edbc22961e
Revert "Further OS X changes."
...
This reverts commit 803011582c .
2012-02-22 05:49:38 -05:00
Shyotl
c2da7f4570
Fixed translations failing attachment text. (support 'value' attribute for strings starting with a space)
2012-02-22 00:09:52 -06:00
Shyotl
bdeead6f8e
Updated LLView:
...
-Removed a few extra unneeded virtuals
-Pulled tabgroups out of llpanel and into LLView
-removeChild doesn't support delete. Delete manually.
-addChildAtEnd renamed to addChildInBack
-getScreenRect renamed to calcScreenRect
-added calcScreenBoundingRect and calcBoundingRect(which updateBoundingRect calls
-General cleanup. Someone at LL figured out that dynamic_cast actually exists.
Fixed PieMenu not reliably centering on cursor.
Fixed context menu crash in line and text editors.
Classes with LLEditMenuHandler as a base do not need to set gEditMenuHandler to NULL, since LLEditMenuHandler's dtor does that already!
2012-02-21 21:59:22 -06:00
Lirusaito
73c2feee97
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-21 16:46:22 -05:00
Drake Arconis
3250725aae
Annoying Crash Fix.
...
This fixes that thing where saving scripts in deleted object makes
viewer go FFFFFF.
2012-02-21 10:56:27 -05:00
Drake Arconis
803011582c
Further OS X changes.
2012-02-21 10:53:47 -05:00
Aleric Inglewood
2206f68129
Fix webkit on Ubuntu
...
WARNING("Plugin"): LLPluginInstance::load: apr_dso_load of
*/viewer-linux-i686-releasesse2/newview/packaged/bin/llplugin/libmedia_plugin_webkit.so
failed with error 20019 , additional info string:
*/viewer-linux-i686-releasesse2/newview/packaged/bin/llplugin/libmedia_plugin_webkit.so:
undefined symbol: XSyncIntsToValue
Apparently our webkit package is underlinked, it doesn't
include libXext which is needed for symbol XSyncIntsToValue.
Both, Fritigern and Inusaito had this problem on Ubuntu.
This patch adds the library to the webkit plugin as a work-
around.
2012-02-21 15:52:57 +01:00
Drake Arconis
6388324552
Revert "This works for now. Need to do more testing."
...
This reverts commit c6d6eed7d3 .
2012-02-21 09:27:10 -05:00
Lirusaito
d4212d390d
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-02-20 17:27:52 -05:00
Lirusaito
2b8a55f396
Add DisableCameraConstraints to the "Camera Options:" checkboxes on Input & Camera Preferences(panel_preferences_input.xml)
2012-02-20 17:13:35 -05:00
TighMacFanatic
89f35779b4
Fixed Windlight presets not loading user created files.
2012-02-20 16:37:34 -05:00
Lirusaito
f253da09ec
Added gesture muting feature, like phoenix has.
2012-02-20 16:02:56 -05:00
Drake Arconis
ad1e3f1d2d
Merge remote-tracking branch 'upstream/master'
2012-02-20 07:19:35 -05:00
Lirusaito
e232abdab2
Merge branch 'master' of git://github.com/siana/SingularityViewer
...
Conflicts:
indra/newview/skins/dark/colors_base.xml
indra/newview/skins/gemini/colors_base.xml
indra/newview/skins/pslgreen/colors_base.xml
indra/newview/skins/pslpurple/colors_base.xml
indra/newview/skins/sapphire/colors_base.xml
2012-02-20 00:01:04 -05:00
Siana Gearz
9477a5f32f
Fix code bug making notifications unreadable colour
2012-02-20 05:38:57 +01:00
Siana Gearz
8e71cf8e6e
Revert "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor."
...
This reverts commit 0fef1407e3 .
2012-02-20 05:05:57 +01:00
Siana Gearz
ea7396d2cf
Crashfix audio panel in skin
2012-02-20 05:05:53 +01:00
Siana Gearz
5c7debecc8
Extra info from j2c decoder in case of cache corruption
2012-02-20 03:47:06 +01:00
Lirusaito
fae40e0bdf
Fix to "Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black"( 0fef1407e3), to only apply to skins where the tan background was too similar to the font color.
...
Also, for skins now using this black background, adjust foreground color to show up and match the skin, in cases where it was black.
2012-02-19 19:58:34 -05:00
Drake Arconis
c6d6eed7d3
This works for now. Need to do more testing.
2012-02-19 19:43:53 -05:00
Shyotl
e2e65c39bf
Fixed up LLMenuGL and variants a bit.
2012-02-19 17:41:54 -06:00
Shyotl
a76105a60d
Few things were missing/misnamed in menu_inventory.xml
2012-02-19 17:28:16 -06:00
Aleric Inglewood
39f8deb498
Merge remote-tracking branch 'siana/master'
2012-02-19 23:54:59 +01:00
Drake Arconis
665569dfc7
I forgot why I made these.
2012-02-19 17:07:42 -05:00
Drake Arconis
19f72cf967
Merge remote-tracking branch 'upstream/master'
2012-02-19 16:16:34 -05:00
Drake Arconis
a4363de59e
Updated APR and Zlib prebuilts.
2012-02-19 15:59:47 -05:00
Siana Gearz
c3aa321d51
Fix classic skin
2012-02-19 21:43:31 +01:00
Shyotl
cf4b8cf263
Added LLView::translateIntoRectWithExclusion utility function.
2012-02-19 13:11:52 -06:00
Siana Gearz
9b268c3654
Fixing the crash in grid list
2012-02-19 20:07:17 +01:00
Drake Arconis
925c42294f
OS X Builds now.
...
Fixed building on OS X.
Fixed line endings.
Need to find better way to do fmodwrapper thing.
2012-02-19 11:30:27 -05:00
Drake Arconis
23811df3cf
Adding to Ignore.
2012-02-19 06:43:04 -05:00
Siana Gearz
f7cc9c4d33
Hopefully more correctness in grid manager editor
2012-02-19 00:42:23 +01:00
Aleric Inglewood
66ccff964b
Comment out old Google Translate support and as such remove the need for JSON.
...
Note that on standalone, json headers are installed in json/,
no idea why in the packages this isn't the case... But anyway,
it isn't used at all anymore now so it doesn't really matter.
I didn't remove the json package for non-standalone and the
downloading thereof... (I can't test non-standalone).
2012-02-18 16:45:11 +01:00
Shyotl
b0240320ee
Inv menus appear now. Still need to update llmenugl and its variants, since our current version is buggy. Also need to look into why inventory postfixes aren't appearing.
2012-02-18 01:59:02 -06:00
Shyotl
1810a7c7f9
Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.
2012-02-18 01:58:02 -06:00
Aleric Inglewood
0c82b8bd3a
Merge remote-tracking branch 'siana/master'
2012-02-18 02:23:26 +01:00
Aleric Inglewood
4e8b69206c
LLViewerRegion: now compiles and seems to work.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
0a7fc0e65e
LLViewerRegion WIP: brought LLTrans up to speed with V3.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
787e03e821
LLViewerRegion WIP: Sync indra/llmessage/llregionflags.h with V3
...
It seems a few flags disappeared; adjusted the code accordingly.
Should do the same as V3 now.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
f381b0c2dd
LLViewerRegion WIP: Use LLViewerRegion::getCapAPI
...
Viewer 3 uses this in LLAgent::setStartPosition and
copy_inventory_from_notecard; so I brought those
up to speed with V3.
The viewer now uses LLViewerRegion::getCapAPI in all
the same place as V3.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
b8744b9e6a
LLViewerRegion WIP: Added all headers that are dragged in.
...
Most in particular llevents.h, which comes along with
the demand that the old events in llevent.h are put
in a namespace LLOldEvents. Made all changes necessary
to compile the rest of the code again (without changing
the actual code: it's still using the old events).
This patch also removes LLStopWhenHandled and LLStandardSignal
from indra/llui/llnotifications.h because those are
moved to llevents.h. That seems to be the only change
to indra/llui/llnotifications.h that isn't floater related,
so I left the rest of that file alone.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
59ee1a1041
LLViewerRegion WIP: Initial copy of llviewerregion.cpp
...
This is basically the changes in viewer 3 to this file,
except that I left alone:
1) We still have a cloud layer (mCloudLayer)
2) LLViewerRegion::regionFlagsToString still adds comma's
and a lot more flags.
3) We still have the extra accessor LLViewerRegion::getNetDetailsForLCD()
4) The actual capabilities requested in LLViewerRegionImpl::buildCapabilityNames
have been left alone and still request the same caps as before.
5) LLViewerRegion::meshUploadEnabled and LLViewerRegion::meshRezEnabled
have been left alone. They seems to do more work in our case,
checking if we have the capability SimulatorFeatures, and doing
something smart when that is not the case.
2012-02-18 02:22:48 +01:00
Aleric Inglewood
88d0983e37
LLViewerRegion WIP: this should compile now.
2012-02-18 02:22:48 +01:00
Aleric Inglewood
3680e022fc
LLViewerRegion: WIP - header changes and anticipated compile fixes
...
Does not compile now.
llviewerregion.cpp wasn't touched.
Other changes elsewhere in the code (like in llstartup.cpp) might still be needed.
2012-02-18 02:22:27 +01:00
Siana Gearz
a642b725e0
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-17 16:00:00 +01:00
Siana Gearz
dbc3a8c65f
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-17 15:59:16 +01:00
Siana Gearz
86cafba0df
Linux fixes by Tofu
2012-02-17 15:57:21 +01:00
Siana Gearz
60ded2ad14
Initial invisiprim support in deferred
2012-02-17 05:52:41 +01:00
Lirusaito
fa560a7081
Fixed up a few settings' strings to display more correct descriptions for ascent settings in debug settings.
2012-02-16 23:10:20 -05:00
Shyotl
ae7b12f230
Interim commit before diving into reworking the inventory panel.
2012-02-16 19:25:59 -06:00
Lirusaito
5023f23cc4
Alt-H for Teleport History, like Phoenix.
2012-02-16 20:09:30 -05:00
Lirusaito
0fef1407e3
Replace all NotifyCautionBoxColor's and AlertCautionBoxColor's that were using tan with black, like Emerald skin's NotifyCautionBoxColor.
...
Black is a far better color for white text to sit on than the former
harsh tan. This will allow users to read notifications like the ones
from changing server versions.
2012-02-16 19:40:36 -05:00
Lirusaito
a09c505fa0
The search line_editor in the status bar needed to be about 20% taller.
2012-02-16 18:28:50 -05:00
Lirusaito
023909b8e0
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-16 16:00:27 -05:00
Shyotl
a90d7bbb46
Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.
2012-02-16 12:00:38 -06:00
Siana Gearz
60081d7ed5
Melanie's fix of FMOD on OS X
2012-02-16 13:23:00 +01:00
Lirusaito
0b5235d054
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-15 23:13:52 -05:00
Siana Gearz
071554acae
Prim blacklisting on derender from Phoenix
2012-02-16 05:02:52 +01:00
Aleric Inglewood
f05343dec1
New libcwd debug channel CAPS.
2012-02-16 02:30:14 +01:00
Lirusaito
a403cef605
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-15 20:20:49 -05:00
Aleric Inglewood
9b4b234c12
Allow AIStateMachine::kill to be called while not running.
...
This can be used for example when a parent statemachine has
a child statemachine and wants to kill() it upon finish.
2012-02-16 01:10:48 +01:00
Aleric Inglewood
42518dbfaa
This fixes a compile error under certain conditions for me.
2012-02-15 20:22:41 +01:00
Aleric Inglewood
4e700a5808
Merge remote-tracking branch 'siana/master'
2012-02-15 20:20:56 +01:00
Siana Gearz
647af6c15a
RLVa: fix drag and drop on inventory items
2012-02-15 16:28:17 +01:00
Siana Gearz
b91ba258e1
Make double click more humane on X11
2012-02-15 14:45:09 +01:00
Siana Gearz
fe579d6e4b
Activity/spam radar enhancement, from Avination
2012-02-15 14:07:03 +01:00
Lirusaito
6d3044b448
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-14 23:48:13 -05:00
Lirusaito
db8564bb3c
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-14 23:48:08 -05:00
Siana Gearz
28f73d1037
Fix large chat font being same as medium
2012-02-15 04:41:51 +01:00
Siana Gearz
dd9196efac
Fix texture preview showing useless inventory UUID
2012-02-15 01:07:41 +01:00
Siana Gearz
c542c7bdbb
Work around pink textures on ATI with 3.1<=GL<=3.2
2012-02-15 01:01:11 +01:00
Siana Gearz
f8aad35775
Skinning and cloth settings realigned properly
2012-02-14 21:29:22 +01:00
Siana Gearz
657c8e8729
Warn if sending imcomplete appearence
2012-02-14 21:06:59 +01:00
Siana Gearz
a451a8f566
SH-2963 Fix for highlight transparent not highlighting 100% transparent objects.
2012-02-14 16:45:31 +01:00
Aleric Inglewood
0e5b1a8fa7
Allow to LD_PRELOAD (any) library just for singularity-do-not-run-directly
...
This adds support for running:
AI_PRELOAD="/path/to/libfoo.so" ./singularity
Note that setting and exporting LD_PRELOAD there doesn't work,
because then those libs are loaded for every executable that
is being run after, including the plugins.
This patch also removes the use of tcmalloc from the plugins...
Before it exported LD_PRELOAD, using tcmalloc for all the command
line tools up till and including running the singularity binary,
as well as for the plugins. Now, it only preloads the tcmalloc
libraries for singularity-do-not-run-directly.
2012-02-14 16:32:12 +01:00
Lirusaito
e922207797
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-13 18:12:23 -05:00
Lirusaito
e447bd98a5
Fix the panel in floater_script_preview.xml to look more like its cousin in floater_live_lsleditor.xml, this removes the awkward border.
2012-02-13 17:47:46 -05:00
Siana Gearz
a0e9e8d4b2
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-13 20:41:04 +01:00
Siana Gearz
09817403ff
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-02-13 20:40:37 +01:00
Siana Gearz
8f6ef05429
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-13 20:40:04 +01:00
Siana Gearz
4cbf259ab3
Experimental tablet and pen support
2012-02-13 20:38:44 +01:00
Siana Gearz
042622b5db
Fix a logic typo in windlight floater
2012-02-13 15:56:31 +01:00
Lirusaito
eff72e15cd
Added icons for Sky and Water buttons for wlf remote.
2012-02-12 17:32:28 -05:00
Lirusaito
aacd33ada7
Added left and right buttons to make the wlf remote better.
2012-02-12 17:09:30 -05:00
Lirusaito
fe00eed401
Added new Windlight components to the wlf remote, and reorganized the bottom area for said parts to fit. (Icons for Sky and Water buttons, not included)
...
Addition of Previous/Next preset buttons, buttons to open advanced water and sky floaters, daylight image and slider,
Added two checboxes, one for region settings to be used, the other for them to always be used, the latter acts strangely but may work... former is fine.
removal of texts since this will be covered by the icons on for advanced floaters
2012-02-12 17:09:17 -05:00
Lirusaito
000d00579b
Add the control name AscentAutoCloseOOC to the checkbox in preferences, so it actually is connected to the autoclosing setting's code.
2012-02-12 17:09:09 -05:00
Lirusaito
63dd39ea51
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2012-02-11 23:35:26 -05:00
TighMacFanatic
87cb88f2f7
Fixed CMake issue with Git version when building locally.
2012-02-11 23:04:16 -05:00
Lirusaito
cb3e8215d6
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-11 22:35:11 -05:00
Lirusaito
a3900a4830
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-02-11 22:34:41 -05:00
Lirusaito
0f9139305a
Widen floater_instant_message's Call/End button to 80 from 53, stop haligning it "right", increase floater's min_width so the expanded button won't stick out ever.
...
The button will be consistent in width with other butons atop instant messages, it looks terrible aligned right, it'll default to center now.
Expansion should also aid in translation, surely the previously allotted space was uncomfortable in other languages.
2012-02-11 22:15:12 -05:00
Siana Gearz
0a8504fb3c
Uncertain attempt at preventing borked texturedata on fetch fallback.
2012-02-12 00:19:25 +01:00
Siana Gearz
d709200fc0
Those memory pools can't be of ANY use with our malloc
2012-02-11 17:01:52 +01:00
Siana Gearz
77df33ebf6
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-11 17:00:00 +01:00
Siana Gearz
8064d561f4
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-02-11 16:59:49 +01:00
Siana Gearz
aaf1e4d21b
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-02-11 16:58:27 +01:00
Shyotl
9f9a4cbaaf
Brought over LLAvatarPropertiesProcessor, and updated relevant floaters to utilize it. (Mainly in the avatar properties floaters)
2012-02-11 04:07:34 -06:00
Inusaito Sayori
e7806f9dac
Set label_width's to 60, the previous largest space allotted sliders for fonts/translations.
2012-02-11 03:02:43 -05:00
Inusaito Sayori
d7eb4fc656
Revert to label_width changes made recently for audio sliders.
2012-02-11 02:30:18 -05:00
Shyotl
d10724ae6f
Remove some dead savedsettings.
2012-02-10 11:20:28 -06:00
Latif Khalifa
0a3116422a
Restore windows shortcut name to include 'Viewer'
2012-02-10 14:09:32 +01:00
Aleric Inglewood
0a59b3bb54
Merge remote-tracking branch 'siana/master'
2012-02-10 02:14:44 +01:00
Aleric Inglewood
e0b21b08fa
Add AITimer and AIPersistentTimer state machines.
...
For use inside other state machines that need timer events.
Wraps AIFrameTimer.
2012-02-10 02:10:12 +01:00
Aleric Inglewood
d4591828c8
Finished AIFrameTimer.
...
Added documentation.
Added AIFrameTimer::isRunning.
Fixed a bug: mCallback was deleted before it was used.
2012-02-10 01:37:43 +01:00
Aleric Inglewood
cad0597524
Allow AIStateMachine::run() to be called from callback functions.
...
This was already documented as working, but turned out not to work.
Now one can call any of the run(...) functions to guarantee a restart
of the statemachine. Using run() without parameters from a callback
function re-uses the old callback information.
Introduces a new enum AIStateMachine::active_type that keeps track
of on which list the statemachine resides, if any. This was necessary
because run() calls cont() which now can be called while the
statemachine is already on the active list, so it needs to know
more than just if it's on the continued_statemachines list or
not.
2012-02-10 00:23:20 +01:00
Siana Gearz
e10581e319
Resolve extern warning on GCC
2012-02-09 22:13:44 +01:00
Shyotl
f7b2139e81
Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)
2012-02-09 14:26:21 -06:00
Lirusaito
f55452d6dd
Pad right removed from join call, it made the button look bad. Also moved said button adjacent the button before it to match with other buttons.
2012-02-09 14:34:37 -05:00
Latif Khalifa
b0c675498c
Base viewer executable and installer names on the viewer channel
...
Example config:
/python develop.py -G VC100 -t ReleaseSSE2 configure -DPACKAGE:BOOL=ON -DFMODEX:BOOL=ON -DVIEWER_CHANNEL:STRING="Singularity Alpha" -DVIEWER_LOGIN_CHANNEL:STRING="Singularity Alpha"
VIEWER_LOGIN_CHANNEL is the string that is used in --chanel switch to the shortcut created
VIEWER_CHANNEL is the string used for executable name and installer name
This example will produce: SingularityAlphaViewer.exe and installer named
SingularityAlpha_x-y-z-buildnr_Setup.exe
2012-02-09 19:48:32 +01:00
Lirusaito
f16da13198
Added keyboard shortcut for whisper in chatbar's tooltip.
2012-02-09 13:37:03 -05:00
Lirusaito
0827b3fce9
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-09 11:49:54 -05:00
Siana Gearz
a3a7f72b7c
Limit PCH size sanely
2012-02-09 15:22:07 +01:00
Siana Gearz
acf378e9f2
Auto-version system
2012-02-09 14:03:49 +01:00
Lirusaito
a39209cd37
Fixed alignment of chats, finally everything lines up.
...
Things look way more professional as buttons and chat and the like all have consisent positions and sizes, to the pixel.
2012-02-09 02:18:41 -05:00
Siana Gearz
2ef5673c18
Let's not segfault Lenny's GCC
2012-02-09 02:10:21 +01:00
Lirusaito
4c10ae1a4c
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/panel_audio.xml
indra/newview/skins/default/xui/en-us/panel_friends.xml
indra/newview/ascentprefssys.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2012-02-08 13:13:58 -05:00
Lirusaito
66c3f282de
Removed repetitive search text.
2012-02-08 12:54:47 -05:00
Lirusaito
fec75d9436
Added commandline for Fake Away Status.
...
Users can turn on and off the fake away status by typing a command.
Can be placed inside gesture to be performed together with going away.
2012-02-08 12:54:34 -05:00
Siana Gearz
ef68f43687
Fix RLVa bug with wearables being unwearables
2012-02-08 16:19:12 +01:00
Siana Gearz
13780fae2a
Revert "Culling and positioning search properly for contacts."
...
This reverts commit 78409deaa7 .
2012-02-08 13:05:51 +01:00
Lirusaito
c294456e2a
Added keyboard shortcut for build.
...
Consistency with other toolbar tooltips.
2012-02-07 14:41:07 -05:00
Lirusaito
6410fb3209
Fix to make audio panel look nice on Windows as well as Linux.
2012-02-07 14:40:10 -05:00
Lirusaito
af22591cc0
Fixed mQuietSnapshotsToDisk compilation error.
2012-02-07 10:57:04 -05:00
Siana Gearz
b0267e4631
Revert "Newer TCMalloc, now with headers!"
...
This reverts commit 69a2d0bc5e .
2012-02-07 15:52:15 +01:00
Siana Gearz
69a2d0bc5e
Newer TCMalloc, now with headers!
2012-02-07 14:01:56 +01:00
Siana Gearz
108b9211ff
Revert "Added Quiet Snapshots To Disk checkbox to Security tab of System Preferences, also corrected comments, since Privacy is called Security now."
...
This reverts commit 787f91085d .
2012-02-07 12:49:59 +01:00
Siana Gearz
97f2474956
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-07 12:43:28 +01:00
Siana Gearz
b4c68d56b6
Reverting Lirusaito's botch on volume controls
2012-02-07 12:43:12 +01:00
Lirusaito
03926c2374
That shouldn't have been deleted, my bad.
...
image_unselected, so the button will actually show, unselected isn't anything.
2012-02-06 21:45:09 -05:00
Lirusaito
787f91085d
Added Quiet Snapshots To Disk checkbox to Security tab of System Preferences, also corrected comments, since Privacy is called Security now.
...
Users can find and change Quiet Snapshot setting easily in a logical place in their preferences.
2012-02-06 19:38:17 -05:00
Aleric Inglewood
1b37bd5df6
Merge branch 'master', remote-tracking branch 'siana/master'
2012-02-06 22:50:06 +01:00
Aleric Inglewood
ea0a5c521f
Fix for libcwd
2012-02-06 22:34:34 +01:00
Lirusaito
6ba69adccc
Renewed support for / starting chat on linux.
2012-02-06 15:30:27 -05:00
Lirusaito
481361f714
Swapped tabs for spaces for proper display on Windows.
2012-02-06 15:29:25 -05:00
Siana Gearz
e1e34623cb
UI purdyness had its flaws - should revisit later
2012-02-06 20:12:02 +01:00
Lirusaito
78409deaa7
Culling and positioning search properly for contacts.
2012-02-06 03:21:44 -05:00
Siana Gearz
787a18d3a8
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-06 04:32:44 +01:00
Siana Gearz
548f9d0a88
Restore starting chat by slash
2012-02-06 04:32:17 +01:00
Siana Gearz
8450386330
Allow to disable chat animation
2012-02-06 03:52:25 +01:00
Lirusaito
8adf2965fd
Apostrophes aren't so difficult.
2012-02-05 21:36:40 -05:00
Lirusaito
e0bf075f7f
word_wrap should be enabled, looks better that way.
2012-02-05 21:36:01 -05:00
Siana Gearz
8a49d4ef94
Allow pretty much any key for gestures, like Emerald
2012-02-06 03:01:15 +01:00
Lirusaito
d85e1afd7e
Spelling fix to documentation.
2012-02-05 18:18:22 -05:00
Lirusaito
c96d1c3aa5
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-02-05 17:57:30 -05:00
Lirusaito
1cbc825461
Culled, some slight tweaks
...
for the good of the world.
TODO: Realign chat history's.
2012-02-05 17:34:05 -05:00
Siana Gearz
f0d6200e8e
Build fix for Visual Studio
2012-02-05 21:53:12 +01:00
Lirusaito
ad24fcca39
Culling, shouldn't affect appearance.
...
(anymore)
2012-02-05 14:36:45 -05:00
Lirusaito
06837a2a77
Stop prepending ((\[[ to actions that end with ))/]], fix compile warning for npos, and remove unnecessary checks from sendMsg()
...
Users can have their actions not get broken should they end with )) or ]] without beginning OOC, while AutoOOC is enabled.
2012-02-05 14:22:52 -05:00
Siana Gearz
47537ba764
Forgotten files for LightShare
2012-02-05 15:43:57 +01:00
Siana Gearz
cd51a6f795
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-02-05 15:23:51 +01:00
Siana Gearz
3d40cd86ac
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-02-05 15:14:53 +01:00
Siana Gearz
b03b4db7c7
Buddy search adjustment
2012-02-05 15:13:52 +01:00
Siana Gearz
859e2701f2
Restore LightShare compatibility
2012-02-05 13:52:50 +01:00
Shyotl
2617df44db
VC doesn't seem to like ctor being used to assign a reference pointer.
2012-02-05 05:58:36 -06:00
Shyotl
01a8e11ef3
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
...
Conflicts:
indra/llcommon/llfasttimer_class.cpp
indra/llcommon/llfasttimer_class.h
2012-02-05 05:57:44 -06:00
Aleric Inglewood
5a455eac91
Fixed LLFastTimers et al.
...
No longer crash when std::vector moves in memory when it grows.
Fixed display of timer values (in ms).
2012-02-05 05:35:01 +01:00
Shyotl
e18e051bfc
sDelayedVBOEnable is still required to prevent framerates from getting clobbered on gl context change.
2012-02-03 14:25:51 -06:00
Shyotl
bf44d3f98e
Prevent using multisample FBOs if FBOs are not enabled, or multisample FBOs are unsupported
2012-02-03 14:12:36 -06:00
Shyotl
b6fa215c4e
Don't render particles on visually muted avatars.
2012-02-03 14:11:29 -06:00
Shyotl
726dc02aaa
Was looking up ascent colors in incorrect control group.
2012-02-03 14:11:10 -06:00
Shyotl
9ee0c5acf3
Having BackgroundYieldTime set to a large enough value would cause a stall if client isn't in focus during login.
2012-02-02 23:44:35 -06:00
Shyotl
5e0140ba81
Fixed a minor syntax error in menu_inventory.xml.
2012-02-02 23:43:04 -06:00
Shyotl
a690c970e6
RenderAutoMuteByteLimit and RenderAutoMuteSurfaceArea: Only 'grey' out visually blocked avatars on impostor pass.
2012-02-02 18:14:52 -06:00
Shyotl
db28c382e0
Apparently LLMeshRepoThread::lodReceived leaked and LL decided to fix it.
2012-02-02 18:07:29 -06:00
Shyotl
1747d529d8
Stall object updates (including flexi) while tiling. Also fix matrix stack breakage
2012-02-02 18:05:07 -06:00
Lirusaito
27763d8390
Small fix for skins' Additional Info box.
...
Accidentally made it editable while culling; No longer.
2012-02-02 17:42:19 -05:00
Lirusaito
ef79781c9a
Disabled editing the avatar key in profiles.
...
Should have already been disabled, the copy button only copies the original key either way and the key is unchanging.
2012-02-02 17:00:39 -05:00
Siana Gearz
7b6ff27c4b
Awesomize buddy search
2012-02-02 12:18:35 +01:00
Siana Gearz
2526d04397
Cosmetic fix llRegionSayTo
2012-02-02 11:31:46 +01:00
Siana Gearz
4ffa06ae07
More reliable preview perm checks
2012-02-02 09:52:34 +01:00
Lirusaito
03c0509a6c
Tiny change to allow /ME to work in instant messages.
...
Sometimes people want to type in all caps, sometimes caps lock goes on by accident, either way, in instant messages, it won't affect /ME anymore.
TODO: /ME for local chat.
2012-02-02 03:49:48 -05:00
Siana Gearz
f68211d83e
Awesomely fixed OpenAL for Linux
2012-02-02 09:06:12 +01:00
Siana Gearz
7694f915f5
Fix cache thinking once full, always full.
2012-02-02 08:43:01 +01:00
Lirusaito
0340778775
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvoavatar.cpp
2012-02-01 11:24:45 -05:00
Lirusaito
6fecfad2a2
Removed value panels from volume.
2012-02-01 11:10:23 -05:00
Shyotl
e9fa5e6f3d
Fixed some static initialization brokenness with fasttimers.
2012-02-01 07:48:40 -06:00
Siana Gearz
b5ec7fe015
Actually enable Region WindLight
2012-02-01 12:20:54 +01:00
Shyotl
b0ccec2b62
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
...
Conflicts:
indra/newview/llvoavatar.cpp
2012-02-01 03:10:46 -06:00
Siana Gearz
55cce46454
Restoring preset loading
2012-02-01 09:59:31 +01:00
Siana Gearz
071745007a
Partial port of Phoenix Windlight parts
2012-02-01 06:36:10 +01:00
Aleric Inglewood
b755bcd495
Merge remote-tracking branch 'origin/master'
2012-02-01 03:35:10 +01:00
Aleric Inglewood
315552d1e0
Allow main window to be unfocused during startup in debug mode.
2012-02-01 03:34:19 +01:00
Aleric Inglewood
e7b2972fc8
LLVFile::readFile must return LLPrivateMemoryPool allocated data.
2012-02-01 03:33:39 +01:00
Aleric Inglewood
e1675f6bd1
Remove erroneous comment.
2012-02-01 03:32:10 +01:00
Aleric Inglewood
2044b88015
Don't use NamedTimerFactory while it's being initialized.
2012-02-01 03:31:19 +01:00
Aleric Inglewood
77a21f95e5
Singleton<> improvements.
...
Allow Singleton<>::instance to be inlined
and add a new warning for accesses to the
singleton while its being initialized.
2012-02-01 03:27:04 +01:00
Aleric Inglewood
a4e05eea9d
Delete singleton instance last, which seems slightly more robust.
2012-02-01 03:23:55 +01:00
Lirusaito
373cb7fb39
Added floater shortcut to toolbar.
2012-01-31 12:54:04 -05:00
Lirusaito
2e240e70d6
Added in snapshot keyboard shortcut to tooltip.
2012-01-31 08:03:16 -05:00
Lirusaito
bdcb5dc877
Culled what wasn't needed, added in keyboard shortcut helpers in tooltips
...
Things still probably can be culled to shorten this file, but what definitely wasn't needed is removed.
People who want to learn keyboard shortcuts now need only hover their mouse over the buttons on the toolbar.
2012-01-31 07:29:39 -05:00
Lirusaito
e7a59c1031
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-31 03:59:25 -05:00
Shyotl
8ae25e4812
GCC compile fix.
2012-01-31 02:57:32 -06:00
Lirusaito
3548521bef
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-31 03:55:57 -05:00
Shyotl
d15ed9ed34
I borked up the sUseStreamDraw logic earlier. When its a stream type, and sUseStreamDraw is false, don't use a vbo at all (I mistakenly had it use a dynamic vbo instead). Also, removed an unused (due to being renamed) setting from settings.xml
2012-01-31 02:54:42 -06:00
Lirusaito
655365247c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llpanelmaininventory.cpp
indra/newview/llpanelmaininventory.h
indra/newview/llvoavatar.cpp
2012-01-31 02:47:02 -05:00
Shyotl
eaecc9a4d0
RenderVBOEnable was completely broken by ll, so I fixed it.
2012-01-30 19:50:41 -06:00
Lirusaito
dfe33963bb
More precise volume controls.
2012-01-30 13:38:39 -05:00
Lirusaito
661f5ede04
Removed max node quick setting(set volatile in settings), put LOD(Obj. Detail) in its place.
2012-01-30 12:44:08 -05:00
Lirusaito
5858f2822c
Further Culling and proper constraints of VolumeLOD for protection.
2012-01-30 12:27:55 -05:00
Lirusaito
379ecccec2
Just more culling.
...
Would have known to do this earlier, but experience is gained through experiences and this was early. Won't move anything, just reduces clutter.
2012-01-30 10:29:59 -05:00
Lirusaito
e69c605c4f
Culled attributes.
...
Looks the same, takes up less space.
2012-01-30 09:41:42 -05:00
Shyotl
f6711e6b4f
Dont alphamask the bodies of visually muted avatars.
2012-01-30 03:52:16 -06:00
Shyotl
e327e7a15e
Converted some frequent setting lookups to LLCachedControl
2012-01-30 03:49:52 -06:00
Shyotl
9973dfd1c7
Tweaked stream buffer size used in fmodex.
2012-01-30 03:44:20 -06:00
Shyotl
b045d9bd96
Precache a few more inventory icons.
2012-01-30 03:28:35 -06:00
Lirusaito
64181e19b8
Safe changes to the IM Floater, Made the send box smaller and cleaned up.
2012-01-30 04:16:52 -05:00
Lirusaito
ef927134f0
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-01-30 01:12:47 -05:00
Lirusaito
f9398a3ab1
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-30 00:06:51 -05:00
Lirusaito
450402d83d
Forward declare LLInventoryViewFinder
...
Compilation error fix.
2012-01-30 00:02:04 -05:00
Shyotl
9f7e9299bd
Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory).
2012-01-29 23:17:28 -05:00
Shyotl
681901cb7c
LLInventoryViewFinder renamed to LLFloaterInventoryFinder
2012-01-29 17:15:18 -06:00
Shyotl
a0c549534f
Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory).
2012-01-29 17:10:04 -06:00
Shyotl
9453c2c2e9
Memory tracking system updated.
2012-01-29 01:33:14 -06:00
Shyotl
32c6365bf9
Octree tweakage.
2012-01-29 01:27:40 -06:00
Shyotl
6c921ba340
Routine V3 merge.
2012-01-29 01:25:39 -06:00
Shyotl
f5818b7621
Pass FMOD_IGNORETAGS flag when creating FMOD Ex streams. Without the flag it is more prone to failing to successfully detect stream format info under certain circumstances.
2012-01-29 01:20:26 -06:00
Shyotl
ac1a6101e1
Streaming audio ticker was getting stuck on (Loading...)
2012-01-29 01:16:34 -06:00
Shyotl
7ff58abc17
Too lazy to amend earlier commit. llpanelvolume.cpp needs lltrans.h
2012-01-28 23:52:48 -06:00
Shyotl
c548aa3497
Enable Hardware Skinning by default for med/high/ultra settings.
2012-01-28 22:11:51 -06:00
Shyotl
d0c782c7ae
A few more translated tidbits. Also converted french strings.xml from BOM with windows lineendings, to non-BOM with unix lineendings.
2012-01-28 22:07:13 -06:00
Shyotl
d9640ecc65
Little cleanup regarding crashlogger toggling.
2012-01-28 22:02:10 -06:00
Siana Gearz
b177324058
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-01-29 04:54:36 +01:00
Shyotl
e7a20b04de
El crappo. Failed to include this file in earlier commit.
2012-01-28 21:37:19 -06:00
Siana Gearz
5245547f28
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-01-28 22:25:40 +01:00
Siana Gearz
ef696d895d
Avoid tag detection spam from radar on every object update
2012-01-28 22:00:21 +01:00
Siana Gearz
a15e72dc03
Force translator off, remove its UI in chat, small adjustments
2012-01-28 21:52:26 +01:00
Siana Gearz
b7997a2677
Force single texture cache clear
2012-01-28 21:51:15 +01:00
Lirusaito
635c8d0f72
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-28 07:02:47 -05:00
Lirusaito
c9269c04be
Fix to quick audio controls, made them less fragile. If cherrypicking 0c3bff3, you should cherrypick this as well, and vice-versa.
2012-01-28 06:50:40 -05:00
Lirusaito
0c3bff3763
Changes to make the changed panel audio look right.
2012-01-28 06:39:39 -05:00
Lirusaito
f06d9294a2
cleaned up default permissions floater, preparing for other changes.
...
Also gave the panel a border, changing its size to look nice.
2012-01-28 01:57:39 -05:00
Shyotl
c39ddb5991
Packager now conditionally includes fmodex/fmod.dll if project is set to use them.
2012-01-28 00:04:21 -06:00
Lirusaito
690338a122
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-27 23:48:52 -05:00
Shyotl
9dd8f1b8ab
Temporarily disable RenderDelayVBUpdate, as it's completely broken.
2012-01-27 21:40:34 -06:00
Shyotl
744b5b6404
Shiny HUD objects not fullbright. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/c7fca203c70f
2012-01-27 21:28:27 -06:00
Siana Gearz
381d86adb7
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-01-28 03:26:52 +01:00
Siana Gearz
26858c026a
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-01-28 03:25:36 +01:00
Siana Gearz
c454044913
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-01-28 03:02:23 +01:00
Siana Gearz
6e57791397
Use NaCL nametag everywhere, even in radar
2012-01-28 03:00:42 +01:00
Lirusaito
1c5fc42772
This bar keeps us from clicking the bottom of the screen, why ever was it commented out?
2012-01-27 04:03:46 -05:00
Lirusaito
9bab3a362f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-27 03:39:23 -05:00
Shyotl
fc65380f2a
Added auto avatar muting(appearance only) based on avatar complexity (disabled by default). Added several missing debug views.
2012-01-27 02:36:26 -06:00
Shyotl
c1b749e12c
Added some missed fasttimers, removed some old ones.
2012-01-27 02:31:57 -06:00
Lirusaito
d310ae3bc6
Changed three tabs to one space and two sets four spaces to avoid square character showing up in some cases.
2012-01-27 03:31:44 -05:00
Lirusaito
9ab0cd11e7
Changed name to Main (General) for easier support for older versions, while retaining the distinct new name.
2012-01-27 02:21:38 -05:00
Lirusaito
51c3f3253b
Changed the name of Vanity's General tab to Main
2012-01-27 02:10:45 -05:00
Lirusaito
00c00b617c
Changed spoof tag's name, added a heads up tooltip for enhanced boobs checkbox, fixed a large typo that made boob rebound have three decimal places, chopped the final bulk of preferences(may need another sweep through earlier ones)
2012-01-27 02:01:45 -05:00
Lirusaito
c0dd8cac46
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-01-26 23:30:41 -05:00
Lirusaito
8c35361878
Did some more chopping, added value boxes for volume controls that can be set, also made sure that the sliders stayed the same happy size.
2012-01-26 23:25:51 -05:00
Latif Khalifa
2e59ae1340
Implemented support for external script editor based on v3 code (part 2)
2012-01-27 05:25:18 +01:00
Latif Khalifa
856507a580
Implemented support for external script editor based on v3 code
2012-01-27 05:22:33 +01:00
Siana Gearz
8899dbef3c
Fix plug-ins not working when path >32 characters
2012-01-27 05:08:15 +01:00
Lirusaito
8e4ea7e3b4
Removed all the scraps, commented out translations, since google decided to "be evil", Made the border around the radio smaller to look nicer.
2012-01-26 22:01:25 -05:00
Lirusaito
5524959f33
More sculpting away of old material, this one seemed to barely need follows
2012-01-26 20:27:42 -05:00
Lirusaito
39959712c1
Once again allowed for port values to reach their full potential, Extended input boxes, move some things left and right(no rearrangements), removal of old stuff.
2012-01-26 19:04:43 -05:00
Lirusaito
c652df10c6
Chopchopchop
2012-01-26 17:27:10 -05:00
Lirusaito
131dc84256
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-26 17:10:44 -05:00
Shyotl
afed6dad84
Fix deferred on mac. VBO cleanup. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/853c76596bdb
2012-01-26 16:09:47 -06:00
Lirusaito
b18033d023
Whoever modified this last is awesome, mostly two liners, not five lines per tag like normal ^*^ Chopped off boring stuffs.
2012-01-26 16:59:54 -05:00
Lirusaito
26bb68fcb7
Changed Texture offset increment to .01
...
Chopped some surrounding code, which shouldn't matter, didn't clean completely.
2012-01-26 16:29:25 -05:00
Lirusaito
2c4f850e5f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-26 16:10:34 -05:00
Lirusaito
502fd90a8d
Didn't really change much here, except a ton of repositioning due to the use of text_editors... these should be texts, most of them.
2012-01-26 16:07:04 -05:00
Lirusaito
f2c6ab27e3
Pulled all the oldstuff, moved some things to nicer spots and nicer sizes and changed the port range so that they can be anywhere within 16-bit unsigned number range.
2012-01-26 14:42:11 -05:00
Lirusaito
40bbeebd27
Fixed what I broke with custom checkbox. Returned the initial value of checkbox, as well.
2012-01-26 14:17:21 -05:00
Shyotl
f9d802f832
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/56ac56c3cc9a
2012-01-26 12:55:24 -06:00
Shyotl
a6f95d21af
LLFolderViewItem and LLFolderViewFolder migrated to llfolderviewitem.cpp/h.
2012-01-26 12:54:38 -06:00
Lirusaito
87f0edc652
Did a ton of stuff that makes General Preferences look prettier, added, changed and rephrased stuff relating to languages... Yay!
...
Removed old bulk.
2012-01-26 13:36:33 -05:00
Lirusaito
97c0800701
Moved strings to a more logical place, rearranged the layout of the top where grouping by row isn't important so that it is grouped by column to inherit left, changed the feathering sliders into spinners, because we're already using spinners everywhere else, and they're nicer.
...
And once more, removed all the bulk of old.
Should mention this is the joystick setup found in input preferences.
2012-01-26 06:57:36 -05:00
Lirusaito
da96043a24
Chopped off a ton of the old stuff, and added value fields... These don't seem to work right, however, no matter, the value fields help make more precise changes.
...
The existence of these were brought up to me by a phoenix user, not sure why showing them was set false.
2012-01-26 05:43:09 -05:00
Shyotl
f6fcf8ca38
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2012-01-26 00:14:38 -06:00
Lirusaito
43b826bd52
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-26 00:03:53 -05:00
Shyotl
cef03d52cb
Un-inline LLFastTimer::NamedTimer::getCountAverage and LLFastTimer::NamedTimer::getCallAverage so some experimenting can be done in llfasttimer_class.cpp without massive recompiles.
2012-01-25 20:14:38 -06:00
Shyotl
29cdfdc13e
Crashfix in LLAgent::teleportViaLocation if called before avatar is loaded (ex: doubleclicking the minimap)
2012-01-25 20:12:26 -06:00
Shyotl
2b8a5b4bd1
Allow tooltip to be refreshed when hovering over fasttimer bars.
2012-01-25 20:11:42 -06:00
Shyotl
910cb29a7f
Truncating fasttimer times to integers in the hovertext is not very useful..
2012-01-25 20:11:07 -06:00
Siana Gearz
3261332e0b
ouch-i-feel-so-stupid build fix
2012-01-26 02:30:42 +01:00
Siana Gearz
6939d2d70b
Build fixes
2012-01-25 23:45:18 +01:00
Siana Gearz
df65a3b7fc
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-01-25 22:20:31 +01:00
Siana Gearz
7d9299d870
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-01-25 22:18:21 +01:00
Lirusaito
00ae7c3cd3
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-25 15:52:32 -05:00
Lirusaito
769c4f43bd
More cleaning up, some rephrasal of old stuff, changed some words to better suitsuit Singularity.
...
*yawn*
2012-01-25 15:45:23 -05:00
Siana Gearz
7fec659979
Update RLVa to 1.4.0-compatible
2012-01-25 21:11:33 +01:00
Lirusaito
d104d15c53
Yay, more cleaning!
2012-01-25 12:54:43 -05:00
Lirusaito
22137671da
Stuff looks nicer than before, and removed a few more large archaic tag attributes. Also restored missing names, names for translating... wish they weren't so large...
2012-01-25 03:33:02 -05:00
Lirusaito
9577607c22
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-24 21:15:32 -05:00
Lirusaito
4340cee991
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-01-24 21:15:15 -05:00
Siana Gearz
d385de9139
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llstartup.cpp
indra/newview/llviewerregion.cpp
2012-01-24 21:22:49 +01:00
Shyotl
c4e0122846
Call display_startup() periodically during initilization to avoid buggy drivers/windows from issuing vpu recover erroneously.
2012-01-23 20:36:25 -06:00
Shyotl
6374f012de
new fasttimers, including ui.
2012-01-23 18:30:54 -06:00
Shyotl
7d4c2aa54f
LLInventoryFilter migrated into llinventoryfilter.cpp/h
2012-01-22 21:46:10 -06:00
Shyotl
c5024ff04d
Stab in the dark at fixing color corruption on 64bit builds.
2012-01-22 21:45:10 -06:00
Aleric Inglewood
63117686b1
Typo fix in comment.
2012-01-22 03:12:24 +01:00
Aleric Inglewood
f6bd78083d
More merge fixes
2012-01-22 02:49:06 +01:00
Aleric Inglewood
f176aeed8d
More 64-bit related compile errors.
2012-01-22 02:48:28 +01:00
Shyotl
51746dc751
Added wearable index handling to LLAgentWearables to scope out further changes. Index is still always zero for now, so behavior should not have changed. (marked with // TODO: MULTI-WEARABLE)
2012-01-21 19:02:19 -06:00
Aleric Inglewood
94d6ef126f
Fix compiler error on 64-bit: error: cast from ‘char*’ to ‘U32 {aka unsigned int}’ loses precision
2012-01-22 01:56:35 +01:00
Aleric Inglewood
14f2df2a72
Remove compiler warning 'cast from pointer to integer of different size'.
2012-01-22 01:50:25 +01:00
Aleric Inglewood
82693aae35
linden_common.h must be included first for libcwd
2012-01-22 01:38:33 +01:00
Aleric Inglewood
c4e55464c9
Resolved collisions of merge with siana/master
2012-01-22 01:32:52 +01:00
Shyotl
4a4b786a60
New inventory observer implementation.
2012-01-21 04:54:39 -06:00
Shyotl
d7d65df9e0
HTTP inventory fetching enabled.
2012-01-21 02:37:22 -06:00
Shyotl
40400d696b
Updated inv fetching impl. Haven't ticked on new caps.
2012-01-21 00:11:19 -06:00
Shyotl
4c201a9b83
Inv fetch migrated from LLInventoryModel to LLInventoryModelBackgroundFetch singleton.
2012-01-20 19:09:44 -06:00
Shyotl
b338506229
VBO updates from Vir Lindens shining fixes. VBO mapping perf improvement. Alpha rigged attachments render fix, hopefully. Crashfix in void pushWireframe.
2012-01-19 19:01:44 -06:00
Shyotl
7805508e8d
SH-2827 crashfix. https://bitbucket.org/VirLinden/viewer-development-shining-fixes/changeset/806c10f621af
2012-01-19 10:36:56 -06:00
Shyotl
9837b0ea2e
A little bit of code shuffling and member renaming in llinventoryview.cpp to line up with v3 a bit better. TO-DO: Many functions in LLInventoryView need to be migrated to something akin to v3s LLPanelMainInventory class.
2012-01-18 23:23:29 -06:00
Shyotl
60d5bb81f2
Tweak to CannotCopyWarning notification. Updated french notifications.xml a tiny bit.
2012-01-18 17:51:09 -06:00
Lirusaito
76cb68600c
Rewrite of ancient xml preferences(The rest of the preferences still need this) so it takes up way less space and actually makes more sense...
...
last commit for a while do to illness.
2012-01-17 05:24:36 -05:00
Lirusaito
a6b270b02d
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2012-01-16 23:14:13 -05:00
Lirusaito
f68a899185
Moved show avatar in Mouselook to Mouselook options... cause that's where it kinda should be...
2012-01-14 11:06:44 -05:00
Latif Khalifa
3299d27197
Added string needed to avoid modal error dialog with marketplace delivery
2012-01-14 16:16:52 +01:00
Siana Gearz
a39bf61977
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-01-14 13:54:24 +01:00
Siana Gearz
6a290864af
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-14 07:38:31 +01:00
Siana Gearz
20ab55752d
Remove megaregion support
2012-01-14 06:46:16 +01:00
Lirusaito
4190816023
Removed the first configure command description and aligned the first two commands with the last two so it looks prettier.
2012-01-13 23:55:49 -05:00
Lirusaito
e33a15d410
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-13 23:46:32 -05:00
Siana Gearz
419f7b41af
Global lineending fixup
2012-01-14 05:42:53 +01:00
Shyotl
670b85a86f
Migrated code out of drag and drop, and into LLGiveInventory.
2012-01-13 22:41:15 -06:00
Siana Gearz
e835d51bdf
Revert "Crude port of megaregion mem corruption fix, by Rev"
...
This reverts commit 6b60fe40c6 .
2012-01-14 05:33:05 +01:00
Siana Gearz
242134d2af
Line ending unbotch
2012-01-14 05:32:22 +01:00
Shyotl
f0f2834cfe
More stuff migrated to llinventoryfunctions.cpp
2012-01-13 21:05:53 -06:00
Shyotl
860bddb1f5
Added LLViewerInventoryType. Migrated some code to llinventoryfunctions.cpp. Pulled LLFolderViewEventListener out into itse own header. Misc tweaks to LLInventoryBridge and LLFolderBridge
2012-01-13 18:11:03 -06:00
Lirusaito
14f9cd57e1
Moved the button up one pixel, aligning it with voice and sound expand buttons, lowered Water preset text a bit, and lowered the water bar one pixel perfectly centering it with the button.
2012-01-13 17:43:15 -05:00
Lirusaito
063112bf59
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-13 15:59:52 -05:00
Siana Gearz
e764329701
Fixed up a merge botch
2012-01-13 21:59:00 +01:00
Lirusaito
27a17b332f
Spelling fix
2012-01-13 15:51:58 -05:00
Lirusaito
373688cfb0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-13 15:50:16 -05:00
Siana Gearz
09d37d7dfd
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
2012-01-13 19:18:22 +01:00
Siana Gearz
b2dd4f652e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-13 19:14:43 +01:00
Siana Gearz
6bbff07e00
UI Purdyness
2012-01-13 19:14:14 +01:00
Lirusaito
09c7e66844
Spelling fix:
...
Query only has on r.
2012-01-13 03:23:20 -05:00
Shyotl
c371b82900
Added an optional val_width to slider and multi_slider_bar. When using this be sure it isn't truncating, as setting this value sets the textbox to a fixed width, with no consideration to the actual value it can contain.
2012-01-13 01:02:46 -06:00
Lirusaito
5da990e8fb
Eep, did I leave that part of the test in?!
2012-01-13 00:52:13 -05:00
Lirusaito
b96beb478c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-13 00:32:03 -05:00
Shyotl
ad3a16fd3b
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2012-01-12 23:30:17 -06:00
Shyotl
21b6b89577
If this assert hits then I want your callstack, and so does Bao Linden. SH-2827
2012-01-12 23:28:38 -06:00
Shyotl
55a66737c0
Disable a certain octree error that likes to fire a bit frequently.
2012-01-12 23:24:44 -06:00
Lirusaito
198e499798
Fix for error: incomplete type ‘LLInventoryObserver’ used in nested name specifier presented by GCC 4.6.2
2012-01-13 00:18:37 -05:00
Lirusaito
9d3b276f61
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-12 23:39:16 -05:00
Lirusaito
b0967463ca
Take a good look at the Settings Panel in the release, see how icky it looks? Well, Boom!
2012-01-12 23:35:58 -05:00
Shyotl
1cc33caaa3
Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions
2012-01-12 18:57:10 -06:00
Lirusaito
0777bedde8
Made it so the quick setting changer button never leaves its exact spot pixel for pixel;
...
Moved where exactly the bottom of the expanded panel was to match the unexpanded bottom;
Extended the bars of WindLight because their lack of capitalization on available real estate has been bugging me;
Changed the tooltip of the WindLight Water control to no longer _reflect the Sky_.
2012-01-12 17:48:43 -05:00
Lirusaito
be978ab76b
A small change issued by Siana to correct a small problem.
2012-01-12 17:35:41 -05:00
Lirusaito
21a64b306d
Added in two options under Help->Bug Reporting for reporting bugs with Singularity more easily:
...
Report Singularity Bug goes to the new issue page.
Singularity Issue Tracker goes to the issues list.
Spelling correction.
WebLaunchSinguIssue is called in these two new menu options.
2012-01-12 13:40:14 -05:00
Lirusaito
5a66c2bfba
Added WebLaunchSinguIssue Notification, which will make sense in the next commit.
...
Also corrected location of Report Bug from in Tools to in Help under Bug Reporting.
2012-01-12 13:32:44 -05:00
Lirusaito
e5a27e6558
Added WebLaunchSinguIssue notification, but if feel my translation skills inadequate, so I'm just throwing this out here for someone like Nomade Zhao to correct and finish.
2012-01-12 13:25:20 -05:00
Lirusaito
6f3a92d772
Fixed spelling.
2012-01-12 13:10:27 -05:00
Siana Gearz
4feb69e342
Crouch toggle rewrite - removed garbage.
2012-01-12 06:35:42 +01:00
Siana Gearz
d2b2c501bc
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
2012-01-12 03:44:48 +01:00
Siana Gearz
465660e235
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-12 01:42:59 +01:00
Siana Gearz
4eea8624b7
Fix keyboard shortcuts like ctrl+w for floaters
2012-01-12 01:37:13 +01:00
Lirusaito
09213950c3
May or may not fix a lack of AO stand animations caused by my last commit... probably does
2012-01-11 11:30:18 -05:00
Lirusaito
d93f0bb56a
Rubber-band camera in crouchtoggle avoided.
2012-01-11 11:18:23 -05:00
Lirusaito
4de23007a5
Added crouch toggle, global bool called isCrouch, function agent_toggle_down bound to toggle_down.
...
Shift+crouch=toggle, crouch doesn't work while toggle crouched, at the moment.
Formatted keys.ini to be completely aligned.
2012-01-11 11:04:12 -05:00
Lirusaito
8543106f5e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-11 02:28:14 -05:00
Shyotl
ced937cc46
Implemented CreateInventoryCategory sim caps support. ( https://bitbucket.org/lindenlab/viewer-development/changeset/d327dcc8ae51 )
2012-01-11 00:55:03 -06:00
Shyotl
9476aedaf6
Respect passed alpha value for checkerboard.
2012-01-11 00:50:39 -06:00
Shyotl
68bc6749e5
Hooked LLTrans into LLNotification stuffs. Also, fixed [CURRENCY] showing up in several places on the buy land window.
2012-01-11 00:49:14 -06:00
Lirusaito
c5d4ccc78d
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-09 17:59:17 -05:00
Shyotl
e847b105f2
CURRENCY added as a default token replacement within LLTrans. (Will be useful when strings are migrated from ui xmls to strings.xml). Also, fixed compile (missed llwindowcallbacks.cpp in my previous commit)
2012-01-09 16:54:13 -06:00
Lirusaito
d6e9b50b99
Spelling fix
2012-01-09 16:14:33 -05:00
Lirusaito
61beedd3d9
Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
...
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
Lirusaito
35333f0105
Spelling fix
2012-01-09 05:20:12 -05:00
Lirusaito
be700d0719
Spelling fix, while changing comment styling.
2012-01-09 05:18:01 -05:00
Lirusaito
5dd2f5e2cf
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-09 05:10:15 -05:00
Shyotl
e9bd6a3b0d
Better translation support relating to client initialization/login.
2012-01-09 01:40:30 -06:00
Lirusaito
d505e515e4
Moved parentheses into liru_assert_strip for usability.
2012-01-08 21:03:13 -05:00
Lirusaito
9fd813267e
Added three macros, two to help the final one which exists to show file and line on llassert messages;
...
Changed the presentation of said messages to look nicer.
2012-01-08 18:21:43 -05:00
Lirusaito
f14e6cdb60
Pretty sure all I did was fix some things that didn't look nice to me or poor syntax highlighters, shouldn't affect performance...
2012-01-07 18:14:36 -05:00
Lirusaito
fe87ac0f3d
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-07 18:14:15 -05:00
Siana Gearz
a6f36abab0
Semicolon care and feeding
2012-01-07 23:44:46 +01:00
Lirusaito
621e677898
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-07 17:09:43 -05:00
Lirusaito
626a94cf8f
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-07 15:38:58 -05:00
Siana Gearz
d66074d2ea
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-07 21:36:24 +01:00
Shyotl
bf28f6514f
Don't grey out 'properties' if selecting multiple items in inventory.
2012-01-06 13:49:24 -06:00
Shyotl
cf62e22409
gpu_table update
2012-01-06 13:48:21 -06:00
Lirusaito
900d063d4f
Just fixed this file up a bit to look a bit nicer... Won't affect performance.
2012-01-06 11:18:31 -05:00
Siana Gearz
b911e86b02
Merge branch 'future' of git://github.com/Shyotl/SingularityViewer
2012-01-06 10:40:05 +01:00
Shyotl
54bfdb7704
Stippling removed. Emulated with a texture and some texcoord manipluation. (looks identical, and works with and without shaders)
2012-01-06 00:53:18 -06:00
Lirusaito
566152c230
Almost completely stripped, saving the final piece for tomorrow
...
((Double clicking from list of chat people on right of chats))
2012-01-05 21:56:48 -05:00
Shyotl
dcbf39bcfa
(Loading...) text in ticker now goes away after 10 seconds. Some streams simply do not provide artist/title metadata. Only parse metadata every half second (opposed to every frame). Also fixed paused text getting clobbered.
2012-01-05 15:52:03 -06:00
Shyotl
c73913a864
Decided to allow width adjustment to ticker floater. It's a little wonky due to blocking height adjustment. LLFloater is kinda crappy and doesen't provide a real max_height/max_width mechanism to do this, so the behavior is a little wonky, but good enough for now.
2012-01-04 18:05:58 -06:00
Shyotl
d3ba4a2b80
Less hardcoded element manipluation for media ticker(allows more freedom for skins, etc). Added gridlines to visualizer. Added oscillator color to color tables (This process sucks, btw).
2012-01-04 03:55:53 -06:00
Shyotl
af7affa9dd
Removed code for a case that will never occur (for oscillator). Also tiny bugfix related to iterating down wavedata buffers.
2012-01-03 21:31:21 -06:00
Shyotl
89e738003c
Default RednerDelayVBUpdate to false.
2012-01-03 20:28:15 -06:00
Shyotl
a3f7399d7d
Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported).
2012-01-03 20:27:56 -06:00
Shyotl
dff195d120
Several transparent ui-related components were writing to the depthbuffer for some silly reason. Don't do that since it messes with occlusion.
2011-12-30 19:15:21 -06:00
Shyotl
48552e3027
Set blendtype back to BT_ALPHA after postprocess, because ui assumes such [aka: glBlendFunc(GL_SOURCE_ALPHA, GL_ONE_MINUS_SOURCE_ALPHA)]. Also, line-ending fixup.. again.
2011-12-30 17:19:23 -06:00
Siana Gearz
c6ce417fac
Attempt at fixing a Linux build botch in ReleaseSSE2
2011-12-29 13:39:59 +01:00
Siana Gearz
a7510d3b3a
Merge git://github.com/Lirusaito/SingularityViewer
2011-12-28 04:28:49 +01:00
CobraElDiablo
aad10c9b8d
SH-2516 Fix: Full Bright Geometry Rendering Increases Rapidly, Destroying Frame Rate. By Bao Linden
2011-12-28 04:27:04 +01:00
Shyotl
ca96e00135
Enable gl sync fence. Missed a vertexbuffer flush. moved LLMultiFloater out of llfloater.(h|cpp) and into its own header and source file, matching v2.
2011-12-26 23:40:18 -06:00
Inusaito Sayori
536189340d
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-12-24 23:39:41 -05:00
Siana Gearz
23b97efb69
Prebuilt fetch now honors CMake-specified plattform
2011-12-25 05:21:37 +01:00
Siana Gearz
2c8e3bb0a3
More Linux build fixes
2011-12-25 04:28:17 +01:00
Inusaito Sayori
7a48cb9979
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-12-24 22:09:45 -05:00
Siana Gearz
2f5caa27fd
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2011-12-25 03:37:03 +01:00
TighMacFanatic
d69f00741f
Openjpeg compile fixes.
2011-12-24 15:07:52 -05:00
Siana Gearz
8c4a52e58d
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-12-24 20:12:47 +01:00
Siana Gearz
fd22d80dfd
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
indra/newview/llmanipscale.cpp
indra/newview/llmeshrepository.cpp
indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
TighMacFanatic
e071dc52fd
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-12-24 13:52:14 -05:00
Shyotl
e1cbeb7e02
Oopsies. Undoing a change that shouldn't have made it into the previous commits. Was simply a part of an experiment.
2011-12-24 11:30:09 -06:00
Inusaito Sayori
9d367cf9f2
Spelling fix
2011-12-24 08:29:58 -05:00
Inusaito
3890e61fbc
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-12-24 03:44:08 -05:00
Siana Gearz
3df853b74b
Merge branch 'future' of git://github.com/TighMacFanatic/SingularityViewer
2011-12-24 09:00:31 +01:00
Siana Gearz
10bc483305
Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer
2011-12-24 09:00:03 +01:00
Siana Gearz
f55fa45b73
No more spammy spam from inventory view, mini update to V3
2011-12-24 08:56:58 +01:00
Siana Gearz
acb24dd3e1
Some Resident scrubbing from IM headers, a-la V3
2011-12-24 08:56:20 +01:00
Inusaito Sayori
4b87c45298
Highlight for selected line should be visible without eyestrain.
2011-12-24 00:31:14 -05:00
Shyotl
a2fb56bf48
Removed soundgroups. Unneeded and redundant. Any potential usefulness is ursuped by LLAudioEngine's channel management, which I do not want to alter.
2011-12-23 18:29:13 -06:00
Shyotl
37095dc2cd
Provide FMOD Ex with format hints. Use software mixing only. Fixed issue with channels being silently stolen due to maxchannels being too low (Wind and streaming audio + 30 sound sources were exceeding max channel count)
2011-12-23 18:00:54 -06:00
Siana Gearz
a57ac5a954
Make OpenJPEG respect our build settings
2011-12-23 23:23:55 +01:00
Siana Gearz
29045609a3
Attempt to fix linking on newer linux
2011-12-23 18:31:47 +01:00
Shyotl
b4dad425aa
Fixed wind not mixing with other audio. Play no more than 30 world sounds at once (new sounds just muted until channels free up). Add fmod profiler support (SHEnableFMODExProfiler). Use FMOD_UNICODE on windows instead of loading files manually and sending raw data to fmod. Incl other misc cleanup.
2011-12-23 02:29:49 -06:00
Shyotl
c73414f1a1
A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes.
2011-12-22 18:01:07 -06:00
Shyotl
6920bee5e2
Fmod metadata parsing. Innitial.
2011-12-21 01:23:04 -06:00
Shyotl
6a5e203884
Remove hardcoded var passing between LLPostProcess and its floater. Now driven through the xml file.
2011-12-17 00:20:54 -06:00
TighMacFanatic
6b1f44ed6d
Fix for a rare error involving llSetPayPrice being used on a child prim.
2011-12-16 18:59:53 -05:00
TighMacFanatic
ab8cd3e5d5
#endif location fix
2011-12-16 18:44:51 -05:00
Shyotl
78f7cc0d64
Prim rotate tool was lacking colors on its 'rings' due to missing gGL.diffuseColor4fv calls.
2011-12-16 06:01:05 -06:00
Shyotl
b607650d5c
V3 merge. Supposedly improves baked texture loading on other avatars. Also increase discard bias on ati if vram starts running out.
2011-12-16 05:57:48 -06:00
Shyotl
1bfa72fa7c
V3 merge. Slight update. Fixes lighting oddities.
2011-12-16 01:50:57 -06:00
Shyotl
0030ca3af7
Fixed extra post-process shaders. Cleaned up and no longer using deprecated functions.
2011-12-16 01:46:20 -06:00
Shyotl
a53e08032f
Prep for UI matrices.
2011-12-11 01:13:47 -06:00
Shyotl
62febda165
Disable rlva name substitution in LLHUDNameTag::setString. Was redundant and hosed up client tags.
2011-12-11 00:47:44 -06:00
Shyotl
a726de0e99
LLTexLayer now using shaders if applicable. Also added misc tidbits missed earlier.
2011-12-10 22:51:52 -06:00
Shyotl
918d527b14
Resolved nametag bubble image failing to load promptly. Also updated texture to that used in v3, as it looks cleaner.
2011-12-10 22:50:26 -06:00
Shyotl
5919c9a788
Resolved issue with nametag bubble vanishing due to incorrect blend states.
2011-12-10 22:47:43 -06:00
Shyotl
14f2248ea1
LLRenderTarget::copyContents more lenient to errors.
2011-12-10 22:46:26 -06:00
Shyotl
81499fc6ea
-Font init cleanup. Now has a dedicated position in startup initilization.
2011-12-10 22:45:42 -06:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
TighMacFanatic
e08e8cf131
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-12-03 13:03:39 -05:00
Siana Gearz
40b4b47023
Silly build fix
2011-12-03 18:52:04 +01:00
TighMacFanatic
2565caf62a
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-12-03 11:52:29 -05:00
Siana Gearz
d63df79b85
Adding Neck and Root attachment points
2011-12-03 03:51:15 +01:00
Siana Gearz
697dd7e929
Preparing to add mesh upload.
2011-12-03 03:43:23 +01:00
TighMacFanatic
f613be9276
Added new water windlight
2011-12-02 10:41:53 -05:00
TighMacFanatic
f5a08b1c12
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-12-01 12:13:56 -05:00
TighMacFanatic
f40bbb1602
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2011-12-01 12:13:42 -05:00
Siana Gearz
aeb766ee37
Attempt at work around OS X VBO slowness
2011-12-01 17:51:30 +01:00
Siana Gearz
cd67046b33
Silly way to clear stringstream on GCC
2011-12-01 17:41:50 +01:00
Siana Gearz
66f4c170cb
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32
2011-12-01 16:51:43 +01:00
Siana Gearz
a485760028
Skipping first time dialogs enabled
2011-12-01 16:51:27 +01:00
Shyotl
0b5a2cd6a3
Un-break for compilers that don't yet support stringstream copying ala C++0x's MoveConstructible
2011-12-01 02:21:23 -06:00
Shyotl
8e7733b2ce
Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy)
2011-11-24 01:03:03 -06:00
Shyotl
08d2c17c65
Alphamask detection tweakage.
2011-11-24 00:31:45 -06:00
Shyotl
09f7136cf4
'Preserve texture scaling when animating textures when "size x" and "size y" parameters to llSetTextureAnim are zero.' https://bitbucket.org/davep/shining-fixes/changeset/db8a3f49c250
2011-11-23 23:44:04 -06:00
Shyotl
c4b77e247e
LLInstanceTracker v3 merge
2011-11-23 23:40:31 -06:00
Shyotl
9f9daba33d
Missed some glRotatef -> gGL.rotatef conversions.
2011-11-23 23:39:42 -06:00
Shyotl
dc3831c86b
llmath v3 merge.
2011-11-23 23:04:54 -06:00
Siana Gearz
ab14f1908c
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32
2011-11-24 04:43:47 +01:00
Shyotl
bf6e1d6c75
Unbork shadows. Apparently texture/texturProj do not return a vector for shadow samplers.
2011-11-23 21:30:32 -06:00
Shyotl
5d8d402403
Fix shader error dumping. (the error file was not being written to.) Also catch exceptions if shader log dir is inaccessable or otherwise unable to be cleared.
2011-11-23 21:29:42 -06:00
Siana Gearz
b8eb3076ce
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32
2011-11-23 23:21:14 +01:00
TighMacFanatic
d16e48e128
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-11-22 00:04:40 -05:00
Shyotl
e46c906a8b
Invalid texure indexes now display as pink to better assist debugging.
2011-11-21 15:56:24 -06:00
Shyotl
83e8a9076b
Several gl calls now wrapped via LLRender (gGL) as prep for future changes:
...
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
2011-11-21 15:55:44 -06:00
TighMacFanatic
56b28756ad
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-11-19 21:36:41 -05:00
TighMacFanatic
13fad75811
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-11-19 21:36:32 -05:00
Shyotl
1cf367aae5
A little vectorization. gluProject replaced with vectorized glProjectf. Added LLMatrix4a::rotate4. Tweaked LLMatrix4a::rotate. Removed extra _mm_movehl_ps call in LLMatrix3a::setTranspose
2011-11-19 20:02:31 -06:00
Shyotl
70909f86c8
Changed some GL matricies to single precision.
2011-11-19 19:05:19 -06:00
Shyotl
1fd908b2c4
Removed maximum_alpha uniform (as it's always 1.0 anyhow)
2011-11-19 15:13:16 -06:00
Siana Gearz
f0108c17b9
Build floater fixes by Cale Flanagan +tinies
2011-11-14 06:36:46 +01:00
Siana Gearz
0566bde61b
Merge branch 'master' of git://github.com/LightDrake/SingularityViewer
2011-11-14 06:13:47 +01:00
TighMacFanatic
a31fc8a612
Issue 14 - unlimited message lengths resolved.
2011-11-11 01:58:43 -05:00
TighMacFanatic
2ba9e16a6c
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-11-10 12:27:02 -05:00
Siana Gearz
e6dce6ad7b
#9 - region restart delay
2011-11-10 03:45:29 +01:00
TighMacFanatic
c87caebcf7
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-11-08 21:13:30 -05:00
Siana Gearz
121a557fe5
Fixes bug #79
2011-11-08 21:54:26 +01:00
Drake Arconis
6aa7f219cd
Merge remote-tracking branch 'upstream/master'
2011-11-08 05:22:47 -05:00
TighMacFanatic
e9e05bec90
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-11-07 19:31:53 -05:00
Siana Gearz
8421661a89
Version 1.6.0(3)
2011-11-08 01:27:12 +01:00
Siana Gearz
7fea7c589d
Make floating text draw distance tunable
2011-11-08 01:26:51 +01:00
TighMacFanatic
0e3b735a60
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-11-07 18:44:33 -05:00
TighMacFanatic
236f5757a2
Fix paste bug in object size to clamp to new megaprim maximums.
2011-11-07 18:42:11 -05:00
unknown
0a44e3ee09
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-11-07 18:29:23 -05:00
Shyotl
ee5a9c97be
Removing some shader warnings under gl 3.x context.
2011-11-07 16:43:30 -06:00
Shyotl
2126654979
Nuked some old redundant camera code.
2011-11-07 16:42:41 -06:00
Shyotl
df40a8c5cf
Fade 'Press ESC to leave mouselook' away after a while.
2011-11-07 16:42:22 -06:00
Siana Gearz
34fb647903
Fix unable to delete links and make more purdy
2011-11-07 05:34:12 +01:00
Siana Gearz
5de4f1e2da
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-11-07 02:36:24 +01:00
Siana Gearz
18dd31f51a
Fix outfit saving
2011-11-07 02:36:05 +01:00
Shyotl
40689f7d1e
Fixed silly movement bug after taking high-res snapshots.
2011-11-06 16:29:43 -06:00
Siana Gearz
4ce0345842
Fix setting adult, mostly
2011-11-06 16:35:49 +01:00
Sovereign Engineer
844e38702a
Merge remote-tracking branch 'upstream/master'
2011-11-03 14:32:35 -04:00
Siana Gearz
5f074c8c82
Fix most annoying minimap glitch
2011-11-02 18:37:56 +01:00
Siana Gearz
5c2b1d396b
French! Huge thanks to Nomade Zhao!
2011-11-02 05:28:02 +01:00
Siana Gearz
b0b7837c4d
Root prim gizmo fix
2011-11-02 04:42:23 +01:00
Siana Gearz
7789c5a703
Restore map overlay on SL
2011-11-01 18:14:43 +01:00
Shyotl
b64cb8d339
Lineending fixup
2011-10-31 20:44:43 -05:00
Shyotl
3891928092
vary_texture_index only needed in shaders when batching.
2011-10-31 20:44:33 -05:00
Shyotl
f5983208eb
Hide the mouse cursor a bit better when grabbing items in mouselook.
2011-10-31 20:44:27 -05:00
Shyotl
0ef5931212
Added a bit of debug output for viewer tool states.
2011-10-31 20:43:56 -05:00
Shyotl
6964cec6f1
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into future
2011-10-31 20:41:36 -05:00
Drake Arconis
a35ef93d19
Right Click Mouse Scroll Zoom and Xcode fix
2011-10-31 15:43:05 -04:00
Drake Arconis
e5f75d1e48
XCode fixes
2011-10-31 13:24:31 -04:00
Siana Gearz
231af66b90
Fixing for OS X
2011-10-31 16:00:05 +01:00
Siana Gearz
f386fc75df
Did SELinux complain about THIS?
2011-10-31 05:24:00 +01:00
Siana Gearz
cc45a24aff
Darwin doesn't use extension function pointer mechanism
2011-10-28 02:05:09 +02:00
Siana Gearz
e06d0b2e70
Whoopsie!
2011-10-27 23:02:35 +02:00
Siana Gearz
0281ac4afe
There is no glext prebuilt on OS X
2011-10-27 22:39:28 +02:00
Brett Murphy
7227c01d79
updated install.xml with correct freetype package for mac-osx
2011-10-27 22:35:38 +02:00
Brett Murphy
c5abde1616
added ctrl-alt-p option for phantom avatar
2011-10-27 22:32:38 +02:00
Siana Gearz
c2a4951f20
Fix grid info fetch ignoring certificates
2011-10-26 21:35:19 +02:00
Shyotl
0fde15246b
Moved some settings out of the main settings.xml and into settings_sh.xml where they belong.
2011-10-22 01:57:39 -05:00
Shyotl
b3423de80a
Shaders dumped to logs/shader_dump directory if 'ShyotlDumpRawShaders' is true, or a shader throws an error of some sort.
2011-10-22 01:55:08 -05:00
Siana Gearz
743449e635
Tinies, custom OpenAL on Linux
2011-10-22 05:09:49 +02:00
Shyotl
405182025d
Resolved warning about 8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c not being found. Also renamed it to transparent.j2c because I hate seeing local textures with uuid filenames... and because v2 renamed it too.
2011-10-21 21:46:35 -05:00
Siana Gearz
bd6d14d741
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-10-22 01:17:59 +02:00
Shyotl
0e190cadcd
LLWorld::destroyClass() wasn't releasing water texture refs.
2011-10-21 15:26:59 -05:00
Shyotl
408f5a4a51
SH-2564. Testing region visibility driven by spatial partitions.
2011-10-21 15:26:27 -05:00
Shyotl
53f5957b92
Animated faces with bumpmapping now behave as expected.
2011-10-21 15:03:46 -05:00
Shyotl
fb32a0be5a
Failed to start tracking a new icon. (Inv_Invalid.png)
2011-10-21 14:52:13 -05:00
Shyotl
474e1ec7cc
Particles (including clouds) vectorized a bit more.
2011-10-21 14:50:55 -05:00
Siana Gearz
1e9d09b82e
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llinventoryicon.cpp
2011-10-21 05:37:07 +02:00
Siana Gearz
c3b1bf4b76
Actually, tga loads more rapidly for some reason
2011-10-21 05:35:33 +02:00
Shyotl
e2d9c31f5e
Fixed inventory icons for shirt and physic wearables.
2011-10-20 22:24:58 -05:00
Siana Gearz
7b81e9d248
Merge branch 'master' of github.com:siana/SingularityViewer
2011-10-21 04:56:21 +02:00
Siana Gearz
6e6c438e2a
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-10-21 04:55:08 +02:00
Siana Gearz
4606c7512e
Icon mishaps, thx Cryo for spotting. +Standalone fix
2011-10-21 04:54:55 +02:00
Shyotl
88e373c960
The copy button in the face edit panel saves the texture params to a non-existant saved setting for some reason. This throws a crasloop prompt. Setting is never read back, so just commenting out this line.
2011-10-20 19:29:51 -05:00
Siana Gearz
f2deb39dac
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/lldrawpoolbump.cpp
2011-10-21 01:42:12 +02:00
Shyotl
8a5793ce23
Selected face overlay no longer z-fights with the selected prim face.
2011-10-20 16:23:28 -05:00
unknown
a36c5f2ee6
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-20 14:56:37 -04:00
Shyotl
c63bf31328
I don't trust this statement to work without the parentesis.
2011-10-20 13:46:56 -05:00
Shyotl
5d811163a6
gDeferredShadowAlphaMaskProgram should be unbound after renderpass
2011-10-20 13:45:28 -05:00
Shyotl
78a98cbf08
Bump shader needs to have texture0 sample assigned to index0, and texture1 as index1. Confirmed in LLDrawPoolBump::bindBumpMap. (This probably isn't required yet, but appears safe)
2011-10-20 13:45:00 -05:00
Shyotl
91348909b5
Shuffled gObjectSimpleWaterProgram and gObjectSimpleAlphaMaskProgram around
2011-10-20 13:43:25 -05:00
Shyotl
73f2543a6f
Use LLGLShader::sIndexTextureChannels instead of mNumTextureImageUnits directly.. also check that channel value isn't invalid. Also make super-sure shaders are disabled on pre opengl 2.0 hardware.
2011-10-20 13:37:09 -05:00
unknown
d80458b726
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-10-20 14:36:59 -04:00
Shyotl
22385c44c8
Make legacy renderpath a bit more strict.
2011-10-20 13:30:29 -05:00
Shyotl
40261d3472
Invalid texunit was still bound after bumpmapping finished
2011-10-20 13:26:08 -05:00
Siana Gearz
06ff562cd2
Added Mobility Radeon 6 series
2011-10-20 20:23:29 +02:00
unknown
e7b023778a
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-10-20 14:08:10 -04:00
Siana Gearz
3e12fe15bc
Version 1.6.0(2)
2011-10-20 18:44:21 +02:00
Siana Gearz
95634e8276
Don't know why exactly this works, but fixes noshader and seems safe.
2011-10-20 13:10:11 +02:00
Siana Gearz
6c19346855
Bug fixing the repackager
2011-10-20 13:09:30 +02:00
unknown
2e4419a295
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-10-19 16:12:15 -04:00
unknown
bdc95a1544
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-19 16:09:24 -04:00
Siana Gearz
68e143de1b
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-10-19 18:11:58 +02:00
Shyotl
5d6aadb268
Prevent estimated vram value from being clobbered if glGetIntegerv memory query returns something too small.
2011-10-19 09:53:44 -05:00
Shyotl
4368c57243
Disabled reserved attrib having reserved locations in shaders. Conflicted with attrib location assumptions elsewhere.
2011-10-19 09:43:28 -05:00
Siana Gearz
ef54491760
GCC 4.6.1 fix
2011-10-19 05:33:09 +02:00
Shyotl
d88f696604
Brought over LLInventoryIcon
2011-10-18 19:44:08 -05:00
Shyotl
82b0171a86
Workaround for mac startup hardlock. (STORM-1641)
2011-10-18 09:33:20 -05:00
Siana Gearz
142427b3e1
Version 1.6.0(1)
2011-10-18 04:17:31 +02:00
Siana Gearz
9c4d50eda3
Fix adding foreign grids
2011-10-18 04:16:17 +02:00
Siana Gearz
f3c8419de8
GCC 4.3 wasn't happy
2011-10-18 04:15:08 +02:00
Siana Gearz
d6524fbd26
Merge branch 'future' of git://github.com/Shyotl/SingularityViewer
2011-10-18 02:29:49 +02:00
Shyotl
4446b0fbad
Give each reserved attribute a consistent index across all shaders.
2011-10-17 19:19:36 -05:00
Shyotl
58ea5f88dc
Spew llinfos for opengl procs that aren't found.
2011-10-17 19:06:22 -05:00
Shyotl
8ce30e9ff7
Fixed a crash for hardware lacking ARB_shader_objects extension support.
2011-10-17 19:05:37 -05:00
Shyotl
67230a3290
Line-ending fixup.
2011-10-17 14:11:30 -05:00
Shyotl
c413d62536
Decouple RenderUseFBO from RenderDeferred, as toggling deferred would leave RenderUseFBO enabled regardless of previous setting.
2011-10-17 14:11:10 -05:00
Shyotl
d1b19aa389
Automatically disable new texture batching when using legacy renderpath.
2011-10-17 12:19:43 -05:00
Shyotl
06048ae818
Fixed avatars being invisible when using legacy path. Assumption of no shader use when LLGLSLShader::sNoFixedFunctionis false is not valid with Singularity.
2011-10-17 12:16:57 -05:00
Shyotl
18e5b94615
Shouldn't need this glFinish as SwapBuffers does the same thing.
2011-10-17 12:12:47 -05:00
Siana Gearz
df3d30acd9
Version 1.6.0.0
2011-10-17 03:56:47 +02:00
Shyotl
02b58694bb
A required hack to LLMediaCtrl due to our LLPanel behaving far too differently right now. (Clicking isn't passed through like it should, and LLMediaCtrl is not currently parsing xml files so postBuild is not called.)
2011-10-15 01:21:10 -05:00
Shyotl
4987bceb61
Navigation buttons now using icons for 'showcase' and 'all' search panels.
2011-10-14 23:58:54 -05:00
Shyotl
ae0196e2c3
Inconsistent line endings in newview/llviewermessage.cpp
2011-10-14 23:15:28 -05:00
Shyotl
04828032f6
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into future
2011-10-14 22:59:03 -05:00
Shyotl
e432943781
Nullcheck in LLMenuItemBranchDownGL::setHighlight (getBranch())
2011-10-14 22:58:27 -05:00
Shyotl
4a910a8037
onVisibilityChange renamed to handleVisibilityChange. Added setVisibleCallback to LLPanel
2011-10-14 22:57:35 -05:00
Siana Gearz
0130423d93
Rev changed grid management incompatibly -.-
2011-10-15 04:46:35 +02:00
Siana Gearz
ca757ff1b2
Spit shine on browser, good as new! Thanks McCabe!
2011-10-15 03:10:31 +02:00
Siana Gearz
61777e9b8c
Newer TCMalloc - fixes TeamViewer and hogging
2011-10-15 02:13:16 +02:00
Siana Gearz
dd672ae5cb
Made collapse in inventory purrrrrrrdy!
2011-10-15 00:46:41 +02:00
Siana Gearz
3ac01ee6c4
Behold, automatic prebuilt muncher!
2011-10-14 09:17:44 +02:00
Siana Gearz
c9e40f666d
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/llmessage/message_prehash.cpp
indra/llmessage/message_prehash.h
2011-10-14 02:44:20 +02:00
Shyotl
d6d8681874
onVisibilityChange renamed to handleVisibilityChange
2011-10-13 17:17:57 -05:00
TighMacFanatic
ff786ad2c7
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-13 18:16:40 -04:00
TighMacFanatic
c95696e8a0
Merge branch 'future' of https://github.com/siana/SingularityViewer into future
2011-10-13 18:13:16 -04:00
TighMacFanatic
4dbed63f0b
Merge branch 'master' of https://github.com/siana/SingularityViewer into future
2011-10-13 18:13:04 -04:00
Siana Gearz
41a305f52b
OK seriously, how dumb can i be?
2011-10-13 18:55:16 +02:00
Siana Gearz
af74766ead
Welcome modern WebKit on Linux
2011-10-13 17:09:16 +02:00
Shyotl
7bbbfd9a9b
Added avatar visibility and sound settings to 'About Land' floater.
2011-10-13 03:22:50 -05:00
Shyotl
956868327c
DEFAULT_ASSET_FOR_INV_TYPE array now matches LLAssetType::EType enum.
2011-10-13 02:30:27 -05:00
Shyotl
008bebd817
Merge with siana/future
2011-10-13 00:03:56 -05:00
Shyotl
4963a064f1
Removal of discarded inventory offers moved to deferred (idle) tick. Nested gInventory.notifyObservers() don't work.
2011-10-12 23:48:25 -05:00
Shyotl
d7e5c4054f
gInventory.cleanupInventory() wasn't called on shutdown.
2011-10-12 23:48:03 -05:00
Siana Gearz
6941fbaaf6
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/newview/llagentwearables.cpp
indra/newview/llagentwearables.h
2011-10-13 04:27:20 +02:00
Shyotl
dbad00ae66
Missing utility functions added to LLViewerInventoryItem, and cleaned up a few things.
2011-10-12 02:33:37 -05:00
Shyotl
36e0f667d5
gAgent.set/getInventoryRootID() changed to gInventory.set/getRootFolderID()
2011-10-12 02:29:12 -05:00
Shyotl
cfd154d46d
Cleanup: Removed a superfluous conditional return.
2011-10-11 11:11:55 -05:00
Shyotl
efa4d17b92
Newly created categories were being named "New *" regardless of valid name being passed to LLInventoryModel::createNewCategory
2011-10-11 10:59:59 -05:00
Shyotl
92f0549dca
NEW_CATEGORY_NAMES array now matches LLFolderType::EType enum.
2011-10-11 10:57:14 -05:00
Shyotl
d73c6d84bf
Windlight floaters' isOpen() functions were always returning true after singleton was created, regardless of current visiblity status. Resulted in pointless syncMenu calls which are very expensive.
2011-10-10 10:20:13 -05:00
Shyotl
a3aec92396
Renamed boolean to something non-opposite of what it actually means.
2011-10-10 10:07:30 -05:00
Shyotl
c9d480a6bf
Display various object list properties when DebugShowRenderInfo is enabled.
2011-10-10 03:06:25 -05:00
Shyotl
f356a574e7
This would occasionally crash on disconnect or failed teleport.
2011-10-10 03:03:53 -05:00
Shyotl
69e733ea86
Cull orphaned attachments from render. Maybe dead av's are lingering?
2011-10-10 00:46:42 -05:00
Shyotl
080407d92f
Picker crash fix. Required due to LL changing behavior of orphan object rendering. (rightclicking an orphan... that techincally shouldn't be being drawn to begin with, would crash)
2011-10-10 00:24:44 -05:00
Shyotl
819fc39f1e
Multi-wearable prep: Updated LLAgentWearables and LLWearable. ItemId<->wearable association moved into individual LLWearables and out of LLAgentWearables. Wearables should now have their name field updated with their parent items name more reliably now, as well.
2011-10-10 00:22:37 -05:00
Shyotl
d40dcfa1cd
Updated LLInventoryModel a bit. Safer cleanup, prevention of recursive notifyObservers calls, more sanity checks, added idleNotifyObservers that will call notifyObservers if stale flag(s) found.
2011-10-10 00:19:01 -05:00
Shyotl
fc3ba78aed
Pulled idle callback functions out of rlvviewer2 and moved them into llcallbacklist where they belong. LLCallbackList brought up to current, as well.
2011-10-10 00:02:12 -05:00
Shyotl
c99aabf17c
LLAgentWearable LLSingleton-ized.
2011-10-09 21:48:01 -05:00
Shyotl
50e750d2e9
RLV locked status of wearables now displayed in inventory panel.
2011-10-09 16:46:52 -05:00
Siana Gearz
591610f211
New tag list to include Radegast
2011-10-09 03:23:04 +02:00
Siana Gearz
7c53fec576
Merge commit 'fb05f258e41591d4ebd87ed4abf7725996984956' into future
2011-10-09 02:19:42 +02:00
Bill Barnhill
851a80d266
Skip libfmodwrapper.dylib if it is not found (instead of erroring out of build); add missing enumeration values for media events to stubs
2011-10-09 02:17:07 +02:00
Siana Gearz
ff0c7a1925
Merge https://github.com/TighMacFanatic/SingularityViewer into future
...
Conflicts:
etc/message.xml
2011-10-09 02:08:20 +02:00
Siana Gearz
afc91b76b0
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-09 02:03:08 +02:00
Shyotl
88df12ddb6
Attempt at a proper fix for attachments/orphan prims being drawn when they shouldn't be (setRegion is already called further down the update chain. Removed a excess call that probably is breaking things.).
2011-10-08 03:11:28 -05:00
Shyotl
9194d5bfcd
Mesh-related updates. In particular, cleanupAttachedMesh wasn't called!
2011-10-08 03:07:32 -05:00
Shyotl
d9d3ff0057
Disable updateTextures entirely for non-visible avatars (culled ones still need updating tho.)
2011-10-08 03:06:41 -05:00
Shyotl
01e10b5087
Let gAgentAvatar be killed on shutdown.
2011-10-08 03:03:11 -05:00
Shyotl
464b16e621
Code consolidation. Redundant code moved into single function (checkMediaURL).
2011-10-08 03:01:32 -05:00
Shyotl
4b08f52332
Disconnected background was double-displayed.
2011-10-08 03:00:10 -05:00
Shyotl
42938abf9b
Static VFS now supported for gAssetStorage lookup.
2011-10-08 02:59:47 -05:00
Shyotl
5e829b7a3a
LLRender's vertexbuffer created via init now, instead of ctor. Allows deallocation/reallocation.
2011-10-08 02:58:23 -05:00
Shyotl
418d80197e
LLVOAvatar::getFullname() now using LLCacheName::buildFullName
2011-10-08 02:57:30 -05:00
Shyotl
bf0bb8d59a
More dead code (renderforselect) removal.
2011-10-08 02:56:39 -05:00
Shyotl
02c2283e11
Cleanup. Mostly harmless. A few gAgentAvatarps changed to isAgentAvatarValid(), which is the only 'change' in behavior. Everything else is insignifigant syntax touchup and shuffling of inlines from headers to cpp files.
2011-10-08 02:53:03 -05:00
TighMacFanatic
85cbc8acda
Fix broken create group popup (no text was showing when it was supposed to ask if you are sure).
2011-10-06 18:52:21 -04:00
TighMacFanatic
76eacbdc43
Added collapse all button to inventory window.
2011-10-06 12:55:30 -04:00
TighMacFanatic
4358e7d827
Fixed the debug textures floater not showing most of the textures.
2011-10-06 11:54:26 -04:00
Shyotl
0fd157fd16
Pants waist height paramater was driving "lower_jacket base bump" layer where it should have been driving the "lower_pants base bump" layer. Also adding some skipped cross_wearable settings, which will likeley be required soon-ish upon updating the wearable parameter manager.
2011-10-06 00:27:14 -05:00
TighMacFanatic
346629f6e0
Fix precompiled headers include order.
2011-10-06 01:12:24 -04:00
Siana Gearz
bb572efed4
Aua, Player!
2011-10-06 04:25:51 +02:00
Siana Gearz
619748ed1e
Fix the map changes to use new blocks rather than adding fields and update the 'real' message template with the changes.
2011-10-06 03:56:06 +02:00
Siana Gearz
df7f37d0eb
Add a bunch of fixes to the world and minimap so that teleports inside a var work and the map looks semi-correct.
...
Conflicts:
indra/newview/app_settings/message_template.msg
2011-10-06 03:56:05 +02:00
TighMacFanatic
ed8fad3fd9
Merge branch 'future' of https://github.com/siana/SingularityViewer
2011-10-05 20:17:24 -04:00
RevolutionSmythe
00196ca439
Fix the minimap so that it has the right sized regions on the map tile.
2011-10-06 00:57:27 +02:00
RevolutionSmythe
b3826181db
Fix a bug with the message template.
2011-10-06 00:55:06 +02:00
Siana Gearz
5ef79d571b
Add another patch for times where the user has no inventory items being worn and the viewer refusing to wearing new ones.
...
Conflicts:
indra/newview/llagentwearables.cpp
indra/newview/llagentwearables.h
2011-10-06 00:12:01 +02:00
Siana Gearz
e849458c1d
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-05 15:57:54 +02:00
Siana Gearz
6b4823429e
Inventory mesh type.
...
Conflicts:
indra/llcommon/llassettype.cpp
indra/llcommon/llassettype.h
2011-10-05 15:54:57 +02:00
Shyotl
d58df6445c
Disabling this tweak. Can look into fixing it later, but it's not a priority right now and it's not working completely right.
2011-10-04 21:51:38 -05:00
Siana Gearz
4a14b75452
Trivial fixes
2011-10-05 01:20:34 +02:00
Siana Gearz
6590172641
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-04 16:26:11 +02:00
Shyotl
ee9649bf2a
Disabling this DEV-20105 'fix', as it draws orphaned prims, including attachments of all things.
2011-10-04 01:44:28 -05:00
Shyotl
07165f014f
ERenderName enum had elements swap around. Doesn't match our saved settings (driven by preferences floater), so reverting and commenting.
2011-10-04 00:34:52 -05:00
Shyotl
6841b0cf47
RLVA fix. LLWearableType::typeNameToType now returns LLWearableType::WT_NONE, not LLWearableType::WT_INVALID
2011-10-03 23:30:07 -05:00
Siana Gearz
13e13ca862
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-04 06:17:54 +02:00
RevolutionSmythe
d7c2701773
Fix the grass.xml so that they don't have odd names that show up in the UI.
2011-10-04 06:08:32 +02:00
Siana Gearz
0a9c611dfd
Merge back the ability to select the tree (not just random, from Imprudence).
...
Conflicts:
indra/newview/app_settings/settings.xml
indra/newview/llfloatertools.cpp
2011-10-04 06:07:52 +02:00
Siana Gearz
2cba3c45bd
Crash fix, cache sanity
2011-10-04 06:02:19 +02:00
Shyotl
30a95e7f45
Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes.
2011-10-03 22:45:13 -05:00
Shyotl
84a301c81a
new throws an exception... checking if the return value is not null without either try/catching or using std::nothrow... would accomplish nothing.
2011-10-03 22:42:56 -05:00
Shyotl
cd86b3a69b
Refactoring.
...
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions.
-LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions.
-LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines.
-LLWearable WearableType conversions yanked. Use LLWearableType.
-LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines.
-EWearableType now LLWearableType::EType
-LLWearable::getID() renamed to LLWearable::getAssetID()
VOAvatar cleanup.
-Removed redundant TEWearable functions.
-Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change.
-LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
2011-10-03 15:00:43 -05:00
Siana Gearz
9ac2c07f52
Merge https://github.com/PlayerDagostino/SingularityViewer into future
...
Conflicts:
indra/llplugin/llplugininstance.cpp
indra/llwindow/llwindowsdl.cpp
indra/llwindow/llwindowsdl.h
indra/newview/llpreviewnotecard.cpp
indra/newview/llviewerwindow.h
2011-10-03 16:10:35 +02:00
Shyotl
74dc875a27
Beginning to pull LLVOAvatarSelf out from LLVOAvatar.
2011-10-02 02:51:10 -05:00
TighMacFanatic
a1628abec3
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
2011-09-27 12:56:04 -04:00
TighMacFanatic
3c758a06a3
Re-enabled Cancel TP button.
2011-09-27 12:37:02 -04:00
TighMacFanatic
344df747d5
Fixed text highlighting so terms found in names do not trigger.
2011-09-27 12:00:28 -04:00
Shyotl
21f39471f1
Allow muting of objects with no name through the chat display.
2011-09-25 18:19:27 -05:00
TighMacFanatic
00699801d2
Merge branch 'future'
2011-09-24 22:36:40 -04:00
TighMacFanatic
9b0723ec8d
Merge branch 'future' of e:/SL_Dev/Shyotl into future
2011-09-24 21:24:58 -04:00
Shyotl
7f934f34f1
Minor renderer updates.
2011-09-23 00:55:24 -05:00
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
Shyotl
7b2aa741aa
LLGestureManager renamed to LLGestureMgr. Also, derived from LLSingleton.
2011-09-03 06:46:47 -05:00
Shyotl
39b8abc4cf
Tiny bit of lleventnotifier cleanup. Only functional difference is that server is notified when an event notification response is handled... also the notifier is deleted (leakfix? I can't find where it was deleted on this case before this new change)..
2011-09-03 06:05:23 -05:00
Shyotl
f36e1d23ea
Mesh metrics bugfix.
2011-09-02 07:00:28 -05:00
Shyotl
d7370d23d2
Hopefully fixed bumpmaps not loading at full resolution. (SH-1069, but ll has tried to fix this a good 20 times previously, so...)
2011-09-02 07:00:10 -05:00
Shyotl
992319f667
Bumpmapping now appears on hud objects in deferred.
2011-09-02 06:57:15 -05:00
Shyotl
3c4f012480
LLVOVolume::lineSegmentIntersect crashfix. http://hg.secondlife.com/mesh-development/changeset/741175a108d1
2011-09-02 06:56:32 -05:00
Shyotl
443d4e9f56
Windlight/water parameter managers now derived from standard LLSingleton instead of using some silly redundant clone.
2011-09-02 06:35:53 -05:00
Shyotl
91cb401324
Don't use shaders for dynamic textures.... again.
2011-09-02 05:56:04 -05:00
Shyotl
5d21e676c6
Added new LSL constants (keywords). OBJECT_SCRIPT_TIME, PARCEL_DETAILS_ID, etc
2011-09-02 04:07:39 -05:00
Shyotl
2d0b2a82ef
Updated GL and GLUT headers. Now separate archives, glext and freeglut(only used in test plugin?).
2011-09-01 00:14:40 -05:00
Shyotl
fd317a4092
newview V3 partial merge.
2011-08-30 01:05:59 -05:00
Shyotl
8d23a7d1d4
LLViewerTexture now has the ability to prevent raw images from being dumped for a specified period of time. Unused for now. Relates to mesh import. Also, BOOST_PREVIEW textures bumped to PO2.
2011-08-29 03:46:13 -05:00
Shyotl
baddb47c44
LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.
2011-08-29 03:44:17 -05:00
Shyotl
c129a1a923
Small LLVFS (LLDirIterator specifically) tweak regarding path existance detection.
2011-08-29 03:35:08 -05:00
Shyotl
09fa7edc8d
LLUI V3 (very)partial merge
2011-08-29 03:33:43 -05:00
Shyotl
aaa6417fb7
Tweak related to cubemaps. Missed this earlier.
2011-08-29 03:22:42 -05:00
Shyotl
2ff52baa20
LLMessage V3 partial merge.
2011-08-29 03:21:23 -05:00
Shyotl
60c122ee15
LLMath V3 partial merge.
2011-08-29 03:21:05 -05:00
Shyotl
59d50f3062
Meshy update. Mostly related to cost calculations... mostly.
2011-08-28 04:05:36 -05:00
Shyotl
c66065b688
CachedControl cleanup in random places. LL's ctor format is supported, so using such in LL code to ease diffs.
2011-08-28 01:04:30 -05:00
Shyotl
7e9f8c7bf8
Several LLStat variables migrated into the LLViewerStats class.
2011-08-28 00:56:57 -05:00
Shyotl
174c1800cc
llgl/llglext updated. TODO: repackage glext from ll's viewer-development branch so this will compile. (I manually extracted glext-68-windows-20110406.tar.bz2 in my build environment just for now.)
2011-08-27 04:49:51 -05:00
Shyotl
2e8b363899
Plugin loading slightly tweaked on windows. Now warns in viewer thread on load failure. Also sets working directory if provided.
2011-08-27 01:58:53 -05:00
Shyotl
1f187b09ee
LLCommon cleanup and updating to V2 (V3 now, I guess.)
2011-08-27 01:57:10 -05:00
Siana Gearz
4c88b328be
*sigh*
2011-08-26 04:47:10 +02:00
Shyotl
863ab7fa6b
Updated LLViewerParcelMgr.
...
Added LLViewerParcelMgr::setTeleportFinishedCallback, setTeleportFailedCallback. Not hooked into anything yet, however.
agentCanBuild, agentCanFly, etc, renamed.
2011-08-19 02:15:22 -05:00
Shyotl
13e0359c6e
CameraAngle changes now picked up on even after camera initilization. Also updated viewport/windowdimension functions and such to new variants.
2011-08-19 02:12:21 -05:00
Shyotl
ce4729d8e9
Some nullchecks added to LLAppViewer::sendLogoutRequest().
2011-08-19 02:04:40 -05:00
Shyotl
9d40820937
New object/avatar interp.
2011-08-19 01:36:01 -05:00
Shyotl
7f2e96f0a3
Misc small updates to renderer.
2011-08-19 01:34:38 -05:00
Shyotl
73d4722706
LLWorld::getMinAllowedZ now passed an object and an explicit position (opposed to assuming object->getPositionGlobal())
2011-08-19 01:32:35 -05:00
Shyotl
e4b640887a
Potential optimization for dense VBO arrays.
2011-08-19 01:29:04 -05:00
Siana Gearz
6b60fe40c6
Crude port of megaregion mem corruption fix, by Rev
2011-08-18 22:15:18 +02:00
Siana Gearz
9d05a11ef0
Trivial build fixes for Linux
2011-08-18 21:17:32 +02:00
RevolutionSmythe
b8cd305f89
Get rid of grid nicks, and just use the Grid Name everywhere (its cleaner, and one less thing to fill out).
2011-08-18 20:56:35 +02:00
RevolutionSmythe
8fc875cee8
Set up reading the grid message from the get_grid_info from Aurora if it exists.
2011-08-18 20:56:20 +02:00
RevolutionSmythe
d84140ead9
Add Aurora to the grid info platform list. Attempt to stop sending "resident" as the last name, except with Second Life.
2011-08-18 20:56:03 +02:00
RevolutionSmythe
3fa0ef5129
Add some of the new pieces to the grid manager panel (not fully hooked up) and hide the values that the grid managers are supposed to set.
2011-08-18 20:54:33 +02:00
Siana Gearz
8e5c8a0f10
Merge branch 'master' of ../singularity into future
...
Conflicts:
indra/newview/llviewerparcelmgr.cpp
indra/newview/llviewerregion.cpp
2011-08-18 19:41:27 +02:00
Siana Gearz
05c132c342
Correct, complete user profile path on Windows
2011-08-18 19:36:12 +02:00
Aleric Inglewood
923c8d32ef
Never pass an empty string as directory path to the filepicker.
...
Should work around the problem as described in
http://code.google.com/p/singularity-viewer/issues/detail?id=117
2011-08-18 19:36:11 +02:00
Siana Gearz
39b18cd2ca
Build fix for that
2011-08-18 19:36:11 +02:00
Siana Gearz
e70bc6b800
Variable size region support, by RevolutionSmythe
2011-08-18 19:36:01 +02:00
Aleric Inglewood
3bde58d970
Wrap sGlobalRawMemory in AIThreadSafe.
...
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
2011-08-18 19:32:45 +02:00
Aleric Inglewood
a43f1ee299
Fix a typo.
2011-08-18 19:32:45 +02:00
Aleric Inglewood
f297068ec0
Don't instantiate LLTextParser::getInstance before user logged in.
2011-08-18 19:32:45 +02:00
TighMacFanatic
2ceebebb49
Fix label on disable TP and login screen options.
2011-08-18 19:32:44 +02:00
Aleric Inglewood
dfa10281ea
LLFrameTimer review and resulting changes.
...
This makes the class API a bit more sane, although
only a bit, because I had to leave it working with
possibly new code merged in from LL: the API can't
really change. I also removed some unused code.
While reviewing how LLFrameTimer worked however,
I did find a few instances where things where broken:
* sFrameDeltaTime wasn't correctly updated (more
than once per frame and therefore erratic). This
only influenced scrolling speed, but still.
* While dragging an inventory item, the scroll
arrows of a tab container didn't work
(LLTabContainer::handleDragAndDrop).
* Map zoom interpolation was broken (it interpolated
between A and B, but used the already updated
interpolation for A the next frame...
(added mCurZoomValInterpolationStart).
2011-08-18 19:30:43 +02:00
Aleric Inglewood
7a739f4915
Minor documentation fixes.
2011-08-18 19:30:42 +02:00
Siana Gearz
6aff0002fa
Merge branch 'future' of github-siana:siana/SingularityViewer into future
2011-08-18 19:26:22 +02:00
Shyotl
d2ae02a855
Slight cleanup. Also, index arrays are always non-strided, so now using vectorization.
2011-08-18 00:33:59 -05:00
Shyotl
210e9ed78b
Prevent slplugin from using too much cpu time.
2011-08-18 00:29:46 -05:00
Shyotl
48abb8280f
SH-2188. Invalid VBO updates for rigged attachments.
2011-08-18 00:28:42 -05:00
Shyotl
ecce8ad23a
Instancetracker update. LLInstanceTrackerScopedGuard was deprecated, now removed.
2011-08-18 00:23:59 -05:00
Shyotl
ca99f5d2e5
Adding cached-control callbacks to the front of the controlgroups signal. It was possible for cachedcontrols to register themselves before settings_setup_listeners, etc, register their own callbacks. If those callbacks ever referenced the setting via cached control then the value in the cachedcontrol would be stale.
2011-08-16 02:39:32 -05:00
Shyotl
20ef149dcb
Added test setting 'ShyotlUseLegacyTextureBatching' to disable new texture indexing. The new indexing method requires heavy branching in shaders, which some hardware may not perfom well with.
2011-08-16 02:37:18 -05:00
Shyotl
7f0662a1ac
Forgot to add a 'take off' button to the physics wearable edit panel, so I'm adding it now.
2011-08-14 23:50:50 -05:00
Aleric Inglewood
3de99315e2
Some AIFrameTimer code cleanup and comment fixes.
2011-08-14 15:42:46 +02:00
Shyotl
978424ced0
Cleanup. Also made it so LLModel::setVolumeFaceData hopefully wont explode if it's ever utilized by future code.
2011-08-14 03:56:54 -05:00
Shyotl
1c38d016d5
Removed old RLV code. Plugged holes with RLVa.
2011-08-14 02:33:57 -05:00
Aleric Inglewood
5945793031
Implementation of AIFrameTimer.
2011-08-13 17:32:50 +02:00
Aleric Inglewood
449e7b2a84
Merge remote-tracking branch 'origin/master'
2011-08-13 17:32:27 +02:00
Shyotl
88df625096
Occluding voidwater again, as not doing such drastically lowers peak framerates. (100+ to ~50 on my hardware)
2011-08-13 03:30:51 -05:00
Shyotl
3213170d32
featuretable fudgery
2011-08-12 19:20:22 -05:00
Shyotl
f551294e66
Alphamasking migrated to shaders instead of using fixed-function. Very early code. Hasn't even made it into viewer-development yet.
2011-08-12 19:20:11 -05:00
Fritigern Gothly
fb05f258e4
Windlight presets from Phoenix, and from LL v3.0
2011-08-13 02:04:48 +02:00
Fritigern Gothly
e1f89bf22e
Corrected a big DUH! and added a few OSSL functions that i have missed. Also made building no longer fail on warnings.
2011-08-12 23:04:27 +02:00
Fritigern Gothly
8aed7eb909
More OSSL additions which were committed today
2011-08-12 00:52:20 +02:00
Fritigern
f10aeaad31
Added the latest LSL and OSSL functions.
...
Signed-off-by: Fritigern Gothly <fritigerngothly@gmail.com >
2011-08-11 22:43:19 +02:00
Shyotl
8e1c70dcaa
Oopsies. Don't cast a LLStrider<> element to LLVector4a. The array itself is aligned, but not necessarily the individual elements(eg: if in strided/interleaved mode!)
2011-08-11 03:35:20 -05:00
Shyotl
8d242f24dd
LLWorld::getAvatars didn't make much sense. What's with that break in the old code? Anyhow, VOAvatar position should override regionlist, probably.
2011-08-11 03:17:55 -05:00
Shyotl
c9860f7b66
Massive deferred update...
...
Plus renamed setupViewport to setup[2|3]DViewport.
Migrated mWindowRect to mWindowRectRaw, mVirtualWindowRect to mWindowRectScaled.
Slowly updating getwindow/getworldview calls to new v2 variants as I run across them.
Cleaned up ascent-related code in llmanip.cpp.
Impostor update tweaks.
Edgepatch water occlusion changes. (no patch flickering on edges of screen while moving camera)
2011-08-11 03:16:17 -05:00
Player Dagostino
b65da876f7
Reindent comments from the previous commit.
2011-08-11 06:23:34 +02:00
Player Dagostino
4683fb4907
On Linux and in standalone mode, first look for SLVoice in the executable path list. If none is found then try to use the one installed with Singularity, if any. Useful for packagers who want to make many sl clients share the same voice program.
2011-08-11 06:19:59 +02:00
Player Dagostino
6ac2d342b3
Drop useless stuff about VBO and occlusion from the impostor patch.
2011-08-11 03:35:52 +02:00
Player Dagostino
4d2447d764
Enable the DSO workaround on linux only AND in standalone.
2011-08-11 02:12:28 +02:00
Siana Gearz
e6de1e0d5a
Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future
2011-08-11 00:55:22 +02:00
Siana Gearz
c6e0c2f323
This should fix the settings
2011-08-11 00:53:17 +02:00
Siana Gearz
06615a580e
Silly kitty me -.-
2011-08-11 00:51:09 +02:00
Siana Gearz
e9777f25a4
OSSL support by Fritigern, fixes #122
2011-08-10 23:57:43 +02:00
Siana Gearz
23c5d5dd48
Merge branch 'V2Mesh' of git://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/newview/lltexturefetch.cpp
2011-08-10 23:21:14 +02:00
Shyotl
ca328aec72
Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change)
2011-08-10 03:53:49 -05:00
Shyotl
896b7146e7
Fixed vertex corruption if avatar shaders are off and jointmesh is not vectorized. Also, now preventing usage of unsupported vectorization paths.
2011-08-10 02:01:53 -05:00
Shyotl
c918384805
Tempfix for curl locking mutexes for too long
2011-08-09 20:57:16 -05:00
Shyotl
bff63ac682
Parammanagers are really not done well. Added manager-specific shader lists instead of just having them dig down the global list every update.
2011-08-09 04:30:35 -05:00
Shyotl
04ea6a967e
Removed dead code related to 'RenderForSelect'.
2011-08-09 02:11:10 -05:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Siana Gearz
cdebc1c5cc
Version 1.5.10(2)
2011-08-09 03:57:57 +02:00
Aleric Inglewood
e95ee85804
Make LLFrameTimer thread-safe.
...
LLFrameTimer::sFrameTime is accessed by the texture
thread as well. Although the only consequences are
that it's possible for a timer in the texture thread
to time out too early (or to never time out when
it's started) when it reads this variable at the
same time as that it is updated, which is pretty
inlikely, it's just not-done to leave anything
thread-unsafe when it's known to be thread-unsafe.
This patch also adds a framework for AIFrameTimer, but
that isn't implemented yet.
2011-08-08 19:21:27 +02:00
Aleric Inglewood
5e69c9fa05
Merge remote-tracking branch 'origin/master'
2011-08-08 19:20:39 +02:00
Siana Gearz
3853d50eec
This should fix KV TVs
2011-08-08 02:40:26 +02:00
Siana Gearz
2cb0dedbd1
This should fix KV TVs
2011-08-08 02:39:29 +02:00
Siana Gearz
5f4328767b
Debug needs SSE2 now too
2011-08-07 22:40:36 +02:00
Siana Gearz
2e88db37ad
Signed warning in texture fetcher
2011-08-07 22:32:07 +02:00
Siana Gearz
ab41bf00c4
Merge branch 'V2Media' of git://github.com/Shyotl/SingularityViewer into future
2011-08-07 20:35:34 +02:00
Siana Gearz
1c6d890a5a
Correct, complete user profile path on Windows
2011-08-07 19:29:57 +02:00
Aleric Inglewood
3d1863c1b5
Make sure we assign name before mStatus
2011-08-07 18:47:01 +02:00
Shyotl
1e7415095c
mCurlGetRequest->process() kersploded. Debugger is being dumb, so adding an assertion for now.
2011-08-06 18:17:55 -05:00
Shyotl
a5f38565fa
Henri-inspired tweakage.
2011-08-06 18:14:54 -05:00
Aleric Inglewood
370890b704
We use is_main_thread() for this.
2011-08-06 13:45:01 +02:00
Shyotl
9aa26648c9
Added CurlUseMultipleThreads (requires restart to change)
2011-08-06 02:29:04 -05:00
Shyotl
f1759e0a96
Old-code related to sim-quota cleaned up.
2011-08-06 02:27:06 -05:00
Shyotl
f9bcbab5f3
Win compile fix. Including stdint.h explodes in vc2010, so #if'd it out for windows.
2011-08-05 21:39:43 -05:00
Shyotl
4dd888353d
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into V2Mesh
2011-08-05 20:12:59 -05:00
Shyotl
550fa0a160
Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh
...
Conflicts:
indra/newview/llspatialpartition.cpp
2011-08-05 19:40:35 -05:00
Shyotl
7bcd259821
Added ShyotlRenderVBOStrideMode to toggle between strided and unstrided VBOs.
2011-08-05 19:24:17 -05:00
Aleric Inglewood
5005f4aa1d
Never pass an empty string as directory path to the filepicker.
...
Should work around the problem as described in
http://code.google.com/p/singularity-viewer/issues/detail?id=117
2011-08-05 14:53:11 +02:00
Aleric Inglewood
7e7a238255
Merge remote-tracking branch 'origin/master'
2011-08-05 14:27:54 +02:00
Shyotl
9cc398e939
Occlusion now using LLVertexbuffer class.
2011-08-05 02:55:13 -05:00
Shyotl
b75a28ec15
Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a
2011-08-05 01:18:27 -05:00
Aleric Inglewood
881d065220
Wrap sGlobalRawMemory in AIThreadSafe.
...
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
2011-08-05 00:05:08 +02:00
Siana Gearz
fc839cb2ff
This should fix the settings
2011-08-04 22:44:25 +02:00
Aleric Inglewood
20d2012fc3
Fix a typo.
2011-08-04 22:41:37 +02:00
Siana Gearz
174a33beb3
Variable size region support, by RevolutionSmythe
2011-08-04 22:20:25 +02:00
Shyotl
2c489d7741
Cleaned up polymesh (mesh vectors/normals size match VBO vectors/normals size to allow memcpy). Prep for vbo testing.
2011-08-04 01:38:56 -05:00
Siana Gearz
8d72f6f516
This temporarily fixes inventory problems on Aurora.
...
DO NOT MERGE THIS INTO FUTURE.
2011-08-04 03:20:51 +02:00
Siana Gearz
8787d37d5c
Build fix for that
2011-08-03 23:16:00 +02:00
Siana Gearz
f65624b242
Debug build fixes, linux32
2011-08-03 17:41:21 +02:00
Siana Gearz
d255bfa6f7
Variable size region support, by RevolutionSmythe
2011-08-03 17:40:06 +02:00
Siana Gearz
393ee9d3eb
This should fix the settings
2011-08-03 17:36:21 +02:00
Siana Gearz
87070be7e3
Merge branch 'master' of github-siana:siana/SingularityViewer into future
2011-08-03 01:01:00 +02:00
Aleric Inglewood
27c91e2571
Don't instantiate LLTextParser::getInstance before user logged in.
2011-08-02 23:26:02 +02:00
Shyotl
4f8186b17e
Debug symbols for llcommon.dll on windows.
2011-08-02 16:21:44 -05:00
Aleric Inglewood
414666ec90
Merge remote-tracking branch 'tigh/master'
2011-08-02 21:05:50 +02:00
TighMacFanatic
f54ca35d1b
Fix label on disable TP and login screen options.
2011-08-02 14:56:18 -04:00
Player Dagostino
258fe82db7
Fix a conflict with tut arising when compiling with gcc 4.6. It also looks like tut::test_result::skip got renamed to tut::test_result::skipped in revision 190.
2011-08-02 20:28:54 +02:00
Player Dagostino
a2313b026c
Apply fix from SNOW-792 for textures rebaking over and over.
2011-08-02 20:21:02 +02:00
Player Dagostino
53182cc4cb
It looks like some binary releases of boost::program_options might not contain split_unix(). Let's not call it.
2011-08-02 20:19:26 +02:00
Player Dagostino
a45de10024
Fix a problem not letting plugins work when the client is built on RedHat and derived systems (Fedora is affected too). Completely avoid apr_dso_load() on Linux (they modified it to open libraries with RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND). Get a standard DSO handle with RTLD_NOW | RTLD_GLOBAL flags instead, and convert it to a valid APR one by using apr_os_handle_put().
2011-08-02 20:15:58 +02:00
Player Dagostino
f3d6931fc3
Another port from CoolViewer of the notecard floater, featuring a menu and search/replace.
2011-08-02 20:07:55 +02:00
Player Dagostino
bcc541f3f2
Fix a problem with the media filter not working properly when the user turns the streams on. Previously it only worked when the avatar tpd or the stream source changed. Also set the filter on by default.
2011-08-02 20:04:19 +02:00
Player Dagostino
3b168065d5
Another port of a great patch from CoolViewer that lets users set the maximum number of actual visible avatars when impostors are on.
2011-08-02 20:01:20 +02:00
Player Dagostino
5009b0544e
Adaptation of the CoolViewer patch that allows Linux users to paste by middle-clicking.
2011-08-02 19:58:47 +02:00
Player Dagostino
4b98d69c2f
Fix the mouse flickering problem inherited by Ascent
2011-08-02 19:55:25 +02:00
Player Dagostino
9ec40dbcac
Slight modification of the wrapper to let qt find its optional plugins in the pathname
2011-08-02 19:53:03 +02:00
Player Dagostino
a9028b5c17
Add some missing clothing entries to the viewer and pie menus
2011-08-02 19:47:33 +02:00
Siana Gearz
82fc160abe
Look and criticize, Aleric
2011-08-02 02:16:31 +02:00
Siana Gearz
3b97a575d1
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
2011-08-02 01:25:46 +02:00
Shyotl
f5915ab83c
Some fixes and cleanup for strided vbos. Added LLStrider::assignArray to clean up some loops, as well as replace LLVector4a::memcpyNonAliased16. Works with both unstrided and strided vbo elements, and alignment padding (LLVec4->LLVec3,etc)
2011-08-01 18:19:08 -05:00
Siana Gearz
04b507d286
Merge branch 'future' of git://github.com/AlericInglewood/SingularityViewer into future
2011-08-02 01:14:28 +02:00
Siana Gearz
45c87257ed
Debug build fixes, linux32
2011-08-02 01:13:53 +02:00
Aleric Inglewood
ef6737d0cd
Shorten the time between freeing the lock and setting mStatus to STOPPED.
2011-08-02 00:05:14 +02:00
Aleric Inglewood
13be594651
Add proper locking around between threads shared variables and the calls to signal() and wait().
2011-08-01 23:46:54 +02:00
Aleric Inglewood
313e008f61
Compile fixes to compile LL_DEBUG, and missing header (for linux?)
2011-08-01 23:33:56 +02:00
Aleric Inglewood
d828f858c9
LLFrameTimer review and resulting changes.
...
This makes the class API a bit more sane, although
only a bit, because I had to leave it working with
possibly new code merged in from LL: the API can't
really change. I also removed some unused code.
While reviewing how LLFrameTimer worked however,
I did find a few instances where things where broken:
* sFrameDeltaTime wasn't correctly updated (more
than once per frame and therefore erratic). This
only influenced scrolling speed, but still.
* While dragging an inventory item, the scroll
arrows of a tab container didn't work
(LLTabContainer::handleDragAndDrop).
* Map zoom interpolation was broken (it interpolated
between A and B, but used the already updated
interpolation for A the next frame...
(added mCurZoomValInterpolationStart).
2011-08-01 21:00:27 +02:00
Siana Gearz
6cfaecf972
GCC buildfixes
2011-08-01 20:42:06 +02:00
Siana Gearz
aa469d860f
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
2011-08-01 19:56:33 +02:00
Siana Gearz
fcd37f3a45
Linuxy fixes
2011-08-01 19:55:57 +02:00
Shyotl
0bd444de5f
A few more rigging related things added in. Also fixed vertex weights
2011-08-01 03:53:25 -05:00
Shyotl
2aa4aa78e2
Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled.
2011-08-01 01:33:07 -05:00
Shyotl
5e9cec2cc5
LLTextParser now a singleton.
2011-07-31 19:09:47 -05:00
Shyotl
3c244e6df0
Added new setCommitCallback and setValidateCallback to LLUICtrl, using boost::signals2. Kept legacy variants for now since they are just used too frequently to remove right now.
2011-07-31 19:08:08 -05:00
Shyotl
17bb0799e0
Added LLAgentUI. Includes improved buildLocationString.
2011-07-31 19:05:53 -05:00
Shyotl
40d644e432
Object edit subpanel now recognizes meshes and disables stitching and block-type dropdowns.
2011-07-31 19:03:25 -05:00
Shyotl
e21c9637ae
Added some glFlushes to lessen framestalls
2011-07-31 19:01:59 -05:00
Shyotl
fd50e54a7d
Fixed rigged shaders not loading under certain scenarios.
2011-07-31 19:00:58 -05:00
Shyotl
28568add4c
Threaded cURL. Consider experimental (what in this branch isn't?), however it drastically reduces hitching for me... so yup.
2011-07-31 02:53:26 -05:00
Shyotl
d397513840
Fixed a mesh-related fasttimer. A freaking \t snuck in. Also, this old fasttimer class is really annoying to maintain.
2011-07-31 02:52:15 -05:00
Shyotl
4034c3464b
Just making sure only one error thread is created.
2011-07-31 02:28:29 -05:00
Shyotl
62d0be964d
Updated LLThread and LLMutex[Base] to prevent nested mutex locks in same thread from hardlocking.
2011-07-31 01:51:43 -05:00
Shyotl
b258b71e07
Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head.
2011-07-30 20:30:07 -05:00
Shyotl
c081efa460
LLVoiceClient::mNextAudioSession now initialized.
2011-07-30 20:28:34 -05:00
Aleric Inglewood
ba5caa6d51
Merge remote-tracking branch 'origin/master'
2011-07-30 23:37:50 +02:00
Shyotl
a237cb9cad
llmemory.h cleanup. pulled llpointer, refcounter, smartpointer, singleton and safe handle out into their own headers. llmemory.h drags all those headers in for legacy support until everything else is cleaned up. getCurrentRSS() moved into LLMemory. getWorkingSetSize() added to LLMemory.
2011-07-29 20:40:08 -05:00
Aleric Inglewood
057a154a6d
Minor documentation fixes.
2011-07-29 17:24:39 +02:00
TighMacFanatic
4b9ab10527
Merge branch 'master' of e:/SL_Dev/Siana
...
Conflicts:
indra/newview/lltexturefetch.cpp
2011-07-26 11:46:14 -04:00
Siana Gearz
ee9b689cb4
OK, more login unbreaking =.=
2011-07-26 06:49:33 +02:00
Siana Gearz
5314f76803
Version 1.5.10(1)
2011-07-26 04:16:47 +02:00
Siana Gearz
2f571a0393
Signed cleanup on texture fetch and one login bug fix
2011-07-26 01:46:53 +02:00
Siana Gearz
dece627991
Merge git://github.com/AlericInglewood/SingularityViewer
2011-07-24 18:19:30 +02:00
Shyotl
1e92e734d8
Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable.
2011-07-23 03:26:30 -05:00
Shyotl
179193d173
Some minor cleanup. Bringing stuff in-line with current to ensure it all works before mesh is actually plugged in.
2011-07-23 03:24:10 -05:00
Shyotl
07c892480a
Vectorized llvolumeface while maintining strided vertexbuffers.
2011-07-22 04:29:19 -05:00
Shyotl
7e98a939fc
commandhandler fixup.
2011-07-21 23:08:38 -05:00
Shyotl
48ef9904c1
A pass at cleaning up LLVertexBuffer a bit. Also removing extra unbinds that caused synchronization issues with mapped vbos.
2011-07-21 01:48:46 -05:00
Shyotl
cc19a4c2da
Aligned strided vertexbuffers.
2011-07-20 23:54:16 -05:00
Shyotl
dfa850931a
Fleshed out llvolume a bit more. Added some utility functions.
2011-07-20 23:53:09 -05:00
Shyotl
a399452d20
Null joint states are getting in the joint map somehow. Added assertions to hunt this down.
2011-07-20 23:52:23 -05:00
Siana Gearz
f30c284063
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/llvfs/lldiriterator.cpp
indra/newview/app_settings/settings.xml
indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
Siana Gearz
2dd733cbaa
Merge branch 'master' into future
2011-07-20 22:12:14 +02:00
Shyotl
fe0cd9f702
Bugfixes. Should fix bizarre cam behavior and lighting issues on carved/hollowed prims.
2011-07-20 15:07:58 -05:00
Shyotl
f2f4542c63
Merge branch 'master' into V2Media
2011-07-20 06:57:27 -05:00
Shyotl
bc221a573e
Merge branch 'master' into V2Mesh
2011-07-20 06:57:07 -05:00
Shyotl
0c82921504
Now tracking llcapabilitypovider.h. Dependency was dragged in a while ago when LLViewerRegion was updated to work with new object cache.
2011-07-20 06:45:24 -05:00
Shyotl
ddb70568e1
And the new files required for it to actually work! Hurrr.
2011-07-20 06:25:22 -05:00
Shyotl
a994df7265
A majority of vectorization done. Note that it's INCOMPLETE. LLVolumeFace and LLVertexBuffer haven't been updated, so it's very dirty(and buggy) at those transitions. Compiles on windoze.
2011-07-20 06:07:13 -05:00
Xara
d018bf99c7
Very, very very very very old bug from 2006, REGRESSION! Patch prevent console spam about failed locales set on systems where global locale is reported by "modern" way, I do not remember author, probably Tofu L. then others, not the better way (better is rewrite all this and fire such code OUT of loop!)
2011-07-19 22:25:50 -07:00
Shyotl
35e0b9b6ff
Data-alignment. SSE intrinsics.
2011-07-19 21:35:35 -05:00
Shyotl
7a689f5ccb
Drawable flag fixup. LLCalc cleanup on shutdown.
2011-07-19 20:18:43 -05:00
Shyotl
179c1bcc0c
Octree capacites/radii/distances definable via settings.
2011-07-19 03:42:30 -05:00
Shyotl
25be08f236
Innitial commit. Did as much as I can for llmediactrl without diving too deep into llviewermedia
2011-07-18 04:21:36 -05:00
Shyotl
52570a7f61
Simplification of LLPrimitive::setVolume ala davep. Have had this for a while, I just never commited until now. Haven't noticed any misbehavior with this alteration, and I'm tired of it going uncommited.
2011-07-18 04:18:12 -05:00
Shyotl
fd35e86ddb
Resolved some null calls regarding web media panel.
2011-07-18 03:31:18 -05:00
Shyotl
9e061d5e35
Apparently MacGL crashes on for loops of variable length. Also, cleaned up a few minor things.
2011-07-18 03:30:58 -05:00
Shyotl
3e9c23e43b
Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.
2011-07-17 19:59:30 -05:00
Shyotl
66336e8151
Now letting LLRenderTarget delete bound textures immediately instead of having them hang around until next frame.
2011-07-17 19:48:37 -05:00
Shyotl
330bf08c9b
Telport history cleanup. I didn't need these static functions, so away they go.
2011-07-17 19:10:22 -05:00
TighMacFanatic
a8fb423e44
Fix compile warning due to signed/unsigned mistake.
2011-07-17 17:04:33 -04:00
Siana Gearz
5b072b030b
Area computation fudging
2011-07-17 21:29:48 +02:00
Siana Gearz
5beccac1d2
This should make media less crashy
2011-07-17 19:32:36 +02:00
Shyotl
6ad9367c24
Trying out new LLCachedControl implementation.
2011-07-16 23:36:56 -05:00
Shyotl
5ec3795716
Resolved LLCachedControl type mismatch with a few settings.
2011-07-16 23:35:08 -05:00
Shyotl
2870d44824
Teleport history now saved to teleport_history.xml. TeleportHistoryMaxEntries specifies how many entries to allow in floater before old entries are dropped.
2011-07-16 23:32:01 -05:00
Shyotl
04ff884c5f
About land, object list crashfix. http://code.google.com/p/singularity-viewer/issues/detail?id=71
2011-07-16 23:05:48 -05:00
Aleric Inglewood
b6d5743ccb
Fix highlighting of Radar and Snapshot toolbar buttons.
...
Thanks to Done Arun.
2011-07-16 17:20:07 +02:00
Shyotl
f00038918c
A few small insignifigant things from v2 llinventory
2011-07-15 02:35:37 -05:00
Shyotl
3fbfeb2de5
llmessage v2 merge.
2011-07-15 02:04:57 -05:00
Shyotl
7e0ee6bb71
Shiny new name cache.
2011-07-15 00:21:38 -05:00
Shyotl
ce064f5af2
Some safe merging with v2.
2011-07-14 01:35:15 -05:00
Shyotl
459f00ccb8
LLVOCache class implemented.
2011-07-13 04:35:38 -05:00
Shyotl
aa526e0314
Texture cache update. World-texures moved to local_assets directory. Removed many old unused ui textures.
2011-07-13 04:27:01 -05:00
Shyotl
684484fd76
Added some missing settings and removed a bajillion old unused settings.
2011-07-13 04:01:12 -05:00
Shyotl
7fa2a62103
Renamed vivox icons from nonsensical uuids to something readable, as per v2.
2011-07-13 03:59:37 -05:00
Shyotl
e2112fa8d5
No change, just comments for stuff to avoid merging in, for now.
2011-07-13 03:56:05 -05:00
Shyotl
4753d65076
V2 llvfs merge
2011-07-13 03:53:12 -05:00
Siana Gearz
ecbb40b092
Whoops, deleted one too many
2011-07-13 10:35:36 +02:00
Siana Gearz
0fa9eef4b2
Double setting cleanup
2011-07-13 08:49:05 +02:00
Siana Gearz
144d96f78c
Fixfudgery
2011-07-13 05:42:52 +02:00
Siana Gearz
3e84087d50
Modified fasttimer view, by Henri
2011-07-13 04:39:42 +02:00
Siana Gearz
2430c189fa
Version 1.5.10(0)
2011-07-12 23:56:03 +02:00
Shyotl
4f8f24921f
Aleric is right. This makes no sense. Don't bring this from v2, cuz it's wrong.
2011-07-12 15:35:35 -05:00
Siana Gearz
bad84aa608
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-07-12 21:40:02 +02:00
Siana Gearz
317b8d4ca1
OSX build changes
2011-07-12 21:39:51 +02:00
Aleric Inglewood
2eb64525ae
Merge remote-tracking branch 'origin/master'
2011-07-12 16:00:33 +02:00
Aleric Inglewood
a59f93266b
Improved documentation regarding kill() a bit.
2011-07-12 15:59:30 +02:00
Shyotl
f93bcae65b
Removed some frequent llinfos/llwarns spam.
2011-07-12 03:44:26 -05:00
Shyotl
8fde48bcb2
Abort fetch of null folders.
2011-07-12 03:39:41 -05:00
Shyotl
cae99f6cc8
Datapacker potentially leaking buffers?
2011-07-12 03:38:23 -05:00
Siana Gearz
cf81a4457e
This fixes exporter
2011-07-12 04:23:48 +02:00
Siana Gearz
379f4c63ec
Zeus has been begging for this
2011-07-11 12:05:53 +02:00
Siana Gearz
62780b0787
llOwnerSay particles interfere with CCS
2011-07-11 04:14:24 +02:00
Shyotl
c320429f41
Hack hackity hack... I mean fixed water-fog sign-error when cam approaches 0 z when using shaders.
2011-07-11 03:30:28 +02:00
Siana Gearz
47b7fdb5e0
LightShare compatible WindLight reset fix, not fully tested
2011-07-11 03:27:59 +02:00
Shyotl
e80cff77f0
Hack hackity hack... I mean fixed water-fog sign-error when cam approaches 0 z when using shaders.
2011-07-10 19:38:43 -05:00
Siana Gearz
59ec4eba2a
HTTP texture get connection throttling
2011-07-10 19:49:48 +02:00
Siana Gearz
1899784afa
new RAM dependent minimum texture memory limits
2011-07-07 14:46:08 +02:00
Siana Gearz
c8e2bdb816
Fix for TCMalloc being linked in wrongly on Linux
2011-07-06 00:12:02 +02:00
Siana Gearz
715f112bad
Merge https://github.com/AlericInglewood/SingularityViewer
2011-07-06 00:01:38 +02:00
TighMacFanatic
ef02c08d4d
Merge e:/SL_Dev/Siana
2011-07-04 17:32:33 -04:00
TighMacFanatic
7cfb41e9a0
Fixes to allow copy/paste of prim position for attachments.
2011-07-04 17:29:10 -04:00
Siana Gearz
1907883e02
This fixes glow on OSX
2011-07-03 22:49:23 +02:00
Siana Gearz
08589058c2
Saner MIME type handling
2011-07-03 19:38:00 +02:00
Siana Gearz
f2a9dbe065
Revert "MIME type fix for media"
...
This reverts commit af9259e626 .
2011-07-03 18:25:48 +02:00
Siana Gearz
62f840adc3
Mac crashlogger disabled for now
2011-07-03 15:37:41 +02:00
Siana Gearz
c30fb72669
If someone wants LL_TESTS, they can turn them on themselves
2011-07-03 14:22:45 +02:00
Siana Gearz
73fd876423
OS X build fixes
2011-07-03 14:08:50 +02:00
Aleric Inglewood
41f5739fba
Merge remote-tracking branch 'origin/master'
2011-07-03 02:12:29 +02:00
Siana Gearz
af9259e626
MIME type fix for media
2011-07-02 19:39:31 +02:00
Shyotl
5cdcf0d237
Merge branch 'future' of git://github.com/siana/SingularityViewer.git
2011-06-30 10:27:13 -05:00
Shyotl
c3ccdeed1d
Unused globals removed.
2011-06-30 10:02:37 -05:00
Aleric Inglewood
0e8be5ff43
Never set -march on STANDALONE.
2011-06-30 03:16:52 +02:00
Aleric Inglewood
5bf3647f46
Better way to test on BOOST_FILESYSTEM_VERSION
...
This way it also compiles with older versions that
don't define BOOST_FILESYSTEM_VERSION (ie, 1.42).
2011-06-30 03:05:07 +02:00
TighMacFanatic
388df73ac2
Fixed dimple/cut text not changing depending on object type.
2011-06-29 18:50:11 -04:00
Siana Gearz
fa790523d9
Version 1.5.9(2)
2011-06-29 22:34:57 +00:00
TighMacFanatic
3e7cd53cdc
Re-enable TP button in IM window.
2011-06-29 18:19:56 -04:00
Siana Gearz
9ab700e4d6
Merge /var/chroot/root/SingularityViewer
2011-06-29 04:00:42 +02:00
Siana Gearz
d72cc065e2
More flexible FMOD search
2011-06-29 02:00:13 +00:00
Siana Gearz
48fb61d303
Oh come on. This doesn't belong here.
2011-06-29 03:28:59 +02:00
Siana Gearz
a7952d0929
CRTP fix for GCC 4.3
2011-06-29 00:37:14 +00:00
Siana Gearz
cf889eed44
Merge git://github.com/Shyotl/SingularityViewer
2011-06-29 01:19:25 +02:00
Siana Gearz
47ddc0d626
Merge git://github.com/AlericInglewood/SingularityViewer
2011-06-28 23:53:01 +02:00
TighMacFanatic
7bac3d2c1f
Fix IM autoresponse not saving.
2011-06-27 14:51:43 -04:00
TighMacFanatic
40aa48f075
Added missing items to notifications.xml
2011-06-27 09:05:47 -04:00
Shyotl
aec0d41b83
Don't clobber custom windlight settings on teleport. Unsure why this was here, but it may be related to opensim 'windlight' message from sim. If so, then a better method is required.
2011-06-27 01:47:44 -05:00
Shyotl
9c971ac4e7
Added myraid of additional options to top scripts/top collisions floaters.
2011-06-27 01:10:56 -05:00
Aleric Inglewood
fae8f7803e
Fix for Communicate flyout button.
...
Remove erroneously linked control variable.
The 'value' of a LLFlyoutButton is the (last) selected value:
a string. Linking it to some random boolean control variable
causes this value to be (re)assigned to the flyout button list
through LLControlVariable::setValue (whenever said boolean
changes, in this case when the floater is made to appear)
which calls getComparableValue with the string value (ie "mute list")
and tries to convert that to a boolean. Obviously That fails
and the value is set to "", effectively having nothing selected
anymore.
This fixes
http://code.google.com/p/singularity-viewer/issues/detail?id=21
2011-06-25 13:45:04 +02:00
Aleric Inglewood
bab33cf034
Merge remote-tracking branch 'origin/master'
2011-06-25 13:32:49 +02:00
Shyotl
d476daba71
Added contextual 'unmark' selection to minimap rightclick menu
2011-06-25 04:53:01 -05:00
Shyotl
378053bd48
two_sided_delimiter workaround (Broken comment blocks in LSL '/*comment*/') Didn't want to mess with the token class for one single case. This fix is pretty straight-forward and self-contained.
2011-06-25 00:28:28 -05:00
Shyotl
046bbf52f9
Agent pie-menu -> tools -> anims... crash fix. http://code.google.com/p/singularity-viewer/issues/detail?id=89
2011-06-23 17:32:19 -05:00
Siana Gearz
6348635d3f
Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl)
2011-06-23 21:11:52 +02:00
Shyotl
69b608bbe4
New asset. Overlay icon for list header: Receive group chat.
2011-06-23 03:58:41 -05:00
Shyotl
0663a3f028
Added checkboxes to groups list for visibility, groupchat, and notices...
...
-Required addition of an extra texture overlay for list headers, as normal button overlay is used for sort arrows.
-Added padding to italic text in scroll list, as the text clipped outside of the element.
-Groups list is now sortable and has header visible.
-'none' entry always be first in the list, regardless of sort order.
-LLGroupMgrGroupData::mListInProfile removed. Was unreferenced and always false. LLGroupMgrGroupData doesn't handle show/chat/notify properties
2011-06-23 03:56:09 -05:00
Aleric Inglewood
9a224f2b5c
Fix to problems with regex characters in group names.
...
Stolen from
https://bitbucket.org/squire_linden/viewer-dev-chop-662/changeset/6f971899f351
2011-06-22 01:22:52 +02:00
Shyotl
5d8ac68d3a
Groups/agent profile floaters now update when a group visbility changes.
...
Apply button in group settings doesn't behave quite as badly after changing notices/chat/show in profile settings.
Groups floater now bolds visible groups, italicized if active (this may need to be something more noticeable)
2011-06-21 12:03:28 -05:00
Aleric Inglewood
a5522c204e
Save Preview As...
...
Replace 'Save Texture As...' in File menu with 'Save Preview As...',
since it's used for textures, sounds, animations, notecards and scripts,
which ever type you have open at the moment.
This fix addresses
http://code.google.com/p/singularity-viewer/issues/detail?id=12
2011-06-21 03:06:43 +02:00
Aleric Inglewood
b852a77a79
AIFilePicker related bug fixes.
...
Bug fix in LLPreviewAnim::gotAssetForSave_continued: the if()
that tests if the result from the filepicker can be used was
accidently negated, mostly causing a crash when cancelling an
animation preview download (open animation, File -> Save Texture As..),
and canceling the save when a filename is picked.
The lifetime of AIFileUpload is actually till the very end
of the main(), causing it's member mPicker to be reused.
This leads to problems. When someone tries to open a file picker
for a file upload of the same time before the previous filepicker
called the callback function (ie, when two filepickers are
opened at the same time, or when the plugin crashes).
With this fix it is possible to open any number of file pickers.
Finally, for linux, LLFastTimers was using assembly with gives
rather random results on multicore machines. Since AIStateMachine
is using this for wait timing, it had a negative effect on
how well the file picker worked (the last message wasn't flushed
for several seconds).
2011-06-21 02:49:34 +02:00
Siana Gearz
04e41002c5
Fixed a couple of shameful things, thanks to Fractured for pointing out
2011-06-21 01:11:14 +02:00
Shyotl
db2f409ef4
Preventing crash if shutting down while in login process.
2011-06-18 22:36:44 -05:00
Siana Gearz
839418991e
Version 1.5.9(1)
2011-06-19 00:41:56 +02:00
Siana Gearz
ac00c9b62e
Login panel, name reset fix
2011-06-19 00:39:06 +02:00
Siana Gearz
79ed0bcff0
Merge git://github.com/Shyotl/SingularityViewer
2011-06-18 22:44:31 +02:00
Siana Gearz
67e1a53ed3
CRLF mishap
2011-06-18 19:25:08 +02:00
Siana Gearz
3f6db319a7
Should resolve Nvidia SLI problem
2011-06-18 19:19:00 +02:00
Xara
ab5bc33585
Swap pecs attachments (lool bug old as as SL)
2011-06-18 15:33:22 +02:00
Xara
424b2be50f
Edited indra/llcharacter/llkeyframewalkmotion.cpp via GitHub
2011-06-18 15:32:58 +02:00
mightymarc
74d42ec740
Added a few lines at beginning, to define strnlen for Macs or else building will result in the following : "error:'strnlen' was not declared in this scope". Was able to successfully compile the latest version on a Mac after adding this.
2011-06-18 15:32:29 +02:00
Siana Gearz
b73a9b9a34
Compensate for possible low LOD bit allocation shifts
2011-06-17 16:04:11 +02:00
Shyotl
102ceaadfe
v2 lscript merge
2011-06-16 23:56:56 -05:00
Shyotl
cfcc0a946d
mAutoPilotFinishedCallback cleared upon autopilot termination.
2011-06-16 22:52:36 -05:00
Shyotl
24e2e7f0d3
Back to LL's flexi handling since they fixed updating their own way.
2011-06-16 22:50:04 -05:00
Shyotl
ed51cdfb57
Make sure _open_osfhandle actually returns a valid handle before assigning buffer.
2011-06-16 22:46:33 -05:00
Shyotl
a6e29b5c5e
Initilization guards added to llviewertexturelist.
2011-06-16 22:45:10 -05:00
Shyotl
6d9b7b14ad
More llinfos output on client initilization.
2011-06-16 22:43:05 -05:00
Shyotl
7ba9e0baca
Added llGetEnv and llRegionSayTo to function dictionary. Fixed llGetLinkPrimitiveParams not having a return type in function dictionary.
2011-06-16 22:41:47 -05:00
Shyotl
6b033b78f5
Added OS detection for Windows Server 2008, Windows Server 2012(beta), and Windows 8(beta).
2011-06-16 21:02:07 -05:00
Siana Gearz
d1cb6d3335
Silly old merge unbotch
2011-06-17 01:03:27 +02:00
Siana Gearz
0d0e9bec5e
More login panel changes
2011-06-17 00:43:53 +02:00
Siana Gearz
5206d36a91
Hopefully fix ogg/vorbis prebuilt
2011-06-16 12:43:40 +02:00
Shyotl
45a1b33f96
Online status no longer gets stuck as 'online' in avatar search panel.
2011-06-15 21:54:00 -05:00
Siana Gearz
a4c60dbf42
Add missing OS X cursors
2011-06-16 04:32:07 +02:00
Siana Gearz
e956487dd8
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2011-06-16 01:53:53 +02:00
Siana Gearz
c82cf613a6
Better saved logins, with grid
...
Please, someone throw away the oodles of dead, confusing and redundant code -.-
2011-06-15 15:14:55 +02:00
Siana Gearz
9d57163479
Inventory Link auto-detection
2011-06-15 04:53:52 +02:00
Siana Gearz
63285a2039
Mini-fixes
2011-06-15 04:24:57 +02:00
Siana Gearz
e7ed9b5b91
Attempt better Intel support
2011-06-15 00:04:51 +02:00
Shyotl
bc1c3dc2e4
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
...
Conflicts:
indra/newview/llagent.cpp
2011-06-14 14:17:15 -05:00
Shyotl
07a34f7be5
Missed a file..
2011-06-14 14:15:39 -05:00
Aleric Inglewood
a8d71f2550
Merge remote-tracking branch 'origin/master'
2011-06-14 16:02:43 +02:00
Aleric Inglewood
e42277a2c2
Compile error bug fix.
...
Introduced by
9e662e50d1 (L3R70)
2011-06-14 14:49:48 +02:00
Aleric Inglewood
a777f293e3
Merge remote-tracking branch 'shyotl/master'
2011-06-14 14:38:59 +02:00
Aleric Inglewood
26848e99e4
AIFetchInventoryFolder bug fix.
...
Forgot to initialize AIFetchInventoryFolder::mCreate.
Also changed assert as it's possible that a statemachine
is in state bs_initialize while checking for idle
statemachines and another, already running statemachine
created the new statemachine.
2011-06-14 14:36:15 +02:00
Siana Gearz
42f60042eb
Idle timer tag update fix, by phr0z3nt04st
2011-06-14 14:13:43 +02:00
Shyotl
9e662e50d1
Added acessors/setters to LLItemInfo, LLSimInfo, and LLWorldMap. Privatized most member variables. Incl. misc closely related v2 cleanup.
2011-06-14 04:59:25 -05:00
Shyotl
101fe0ed01
Workaround for hardware light brighness/atten being too intense upon fullscreen toggle.
2011-06-14 01:11:47 -05:00
Shyotl
28098c79d2
Streamed vbo checkbox wasn't enabling/disabling on RenderUseVBO change.
2011-06-13 23:22:09 -05:00
Shyotl
43fd687b7c
Fixed nullptr call on shutdown.
2011-06-13 23:20:45 -05:00
Shyotl
ded24bfe2d
Added a little verbosity to LLViewerObjectList::killObjects
2011-06-13 20:22:46 -05:00
Shyotl
ac363d5b54
LLPanelAvatar::resetGroupList was marking visible groups incorrectly. Old method required a long-removed color. Changed to simply toggling bold state instead.
2011-06-13 20:17:13 -05:00
Shyotl
bbc6f9d4c3
Preventing nullptr crash due to LLURLRequest::process_impl being called before initilization on rare occasion.
2011-06-13 20:14:59 -05:00
Aleric Inglewood
a6dfe7837a
Add missing headers for classes used in this header
2011-06-10 01:48:50 +02:00
Siana Gearz
96a506a1d5
Media plugin update
2011-06-10 00:31:51 +02:00
Shyotl
25bb20046b
Added AllowLargeSounds setting to disable v2 sound-decode strictness
...
Conflicts:
indra/newview/app_settings/settings.xml
2011-06-09 16:53:46 -05:00
Siana Gearz
977ee9d8ea
Exit the window finder loop if a window is found that is it's own parent.
2011-06-09 21:44:38 +02:00
Siana Gearz
d06ea4d211
Constant type fix
2011-06-09 21:41:54 +02:00
Siana Gearz
8bf88bd7da
Fix the fix.
2011-06-09 20:46:16 +02:00
Aleric Inglewood
bde4826c24
Merge remote-tracking branch 'shyotl/master'
2011-06-09 18:58:52 +02:00
Siana Gearz
b64bd9c74f
Linux build fixes
2011-06-09 17:37:57 +02:00
Siana Gearz
2bde195c77
Merge git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/cmake/Boost.cmake
2011-06-09 15:30:19 +02:00
Aleric Inglewood
425e1581ae
Port to boost::signals2
2011-06-09 15:25:03 +02:00
Siana Gearz
41a910d1b5
Boost 1.45 from V2 on Linux and OS X
2011-06-09 15:04:10 +02:00
Shyotl
c57b97c8df
LLAgentWearables Transition (1/1)
2011-06-09 01:35:49 -05:00
Shyotl
858f4d1487
Fasttimer was using incorrect clock count precision.
2011-06-08 23:11:41 -05:00
Shyotl
ec9da17ed0
Merging broke compile. Fixing and removing a few no-longer-needed global constants.
2011-06-08 17:06:28 -05:00
Shyotl
b691e2b286
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
2011-06-08 14:19:43 -05:00
Shyotl
9746f7cc27
Added lldeleteutils.h to llcommon/CMakeLists.txt
2011-06-07 22:42:34 -05:00
Shyotl
1434051f4e
LLAgentCamera transition (2/2)
2011-06-07 22:39:23 -05:00
Shyotl
a07e399801
LLAgentCamera transition (1/2)
2011-06-07 21:35:10 -05:00
Aleric Inglewood
5d87098bd0
Port Viewer 2 indra/llvfs
...
This introduces some API changes, like the new LLDirIterator,
that causes changes elsewhere.
It also include Log Linden's cache changes that aren't in
viewer-development yet that increase the maximum cache size
to ~10 GB.
2011-06-06 21:38:58 +02:00
Siana Gearz
630059a74f
Merge git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/newview/llpaneldisplay.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2011-06-05 19:56:46 +02:00
Siana Gearz
1473486f23
Apply hollow size patch by Zauber Paracelsus
2011-06-05 19:09:43 +02:00
Siana Gearz
37f8a6e00b
Applied patch for #37 by anonymous
2011-06-05 19:06:54 +02:00
Siana Gearz
ab5b0592a8
Merge git://github.com/TighMacFanatic/SingularityViewer
2011-06-05 18:58:33 +02:00
Aleric Inglewood
b31dd134f6
Never call gDirUtilp->getExpandedFilename when getLindenUserDir() is empty.
2011-06-05 15:53:05 +02:00
Aleric Inglewood
08f2724481
Compile error for Debug.
...
Remove last instance of mCtrlReflections.
2011-06-05 15:24:32 +02:00
Shyotl
278cfbdb67
Exposed light projection textures in object edit panel.
2011-06-04 15:09:37 -05:00
Aleric Inglewood
50ce0c4183
Compiler error fix.
...
indra/newview/llspatialpartition.cpp:1079:53: error: operation on ‘((LLSpatialGroup*)this)->LLSpatialGroup::mObjectBounds[0]’ may be undefined
2011-06-03 23:22:10 +02:00
Aleric Inglewood
55f1d00c3b
Compiler error fix.
...
How can this every have compiled? Please don't push commits
without first at least compiling it :/
Using '#else if' instead of '#elif'?!
indra/newview/llappviewer.cpp:797:7: error: extra tokens at end of #else directive
2011-06-03 23:10:53 +02:00
Aleric Inglewood
76db455351
Compile error fix.
...
indra/newview/llselectmgr.h:517:7: error: extra qualification ‘LLSelectMgr::’ on member ‘selectionSetMediaTypeAndURL’
2011-06-03 23:02:38 +02:00
Aleric Inglewood
fb39ac046e
Merge branch 'V2Renderer'
2011-06-03 22:56:18 +02:00
Aleric Inglewood
613c6755e9
Fix sound explorer.
...
Looping sounds were always showing as 'Looping', even after they
stopped. Detection of stopped sounds is much better now.
Instead of only logging a sound as stopped when the audio source
is destroyed, we now detect whether or not it is associated with
an audio channel or not (the normal way to stop a sound is to set
the channel to NULL). This is still a bit fuzzy, since an
audio channel doesn't necessarily have to be playing, but states
where an audio source is associated with a non-playing audio channel
are only short temporary states that don't affect the usefulness
of the sound explorer.
2011-06-03 22:51:46 +02:00
Aleric Inglewood
fed8951e00
Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer
2011-06-03 22:48:23 +02:00
Shyotl
fef7ce9f76
Updated LLSelectMgr
2011-05-30 19:56:00 -05:00
Shyotl
a1942ebc94
Bulldozed llprocessor. Make sure this doesn't explode on linux or mac. May be missing system headers on those systems. Not sure if carbon.h is needed for mac.
2011-05-30 01:35:44 -05:00
TighMacFanatic
b7a697bcf9
Merge branch 'PrefsUpdate'
2011-05-29 20:23:59 -04:00
TighMacFanatic
abf5f09a46
Removed uncalled function.
2011-05-29 20:22:02 -04:00
TighMacFanatic
3813ccb15a
Removed commented out code.
2011-05-29 20:18:44 -04:00
Shyotl
95ea174d43
Spatial partition updated. Seems to run smoother for me, but may want to test on other systems.
2011-05-29 16:28:56 -05:00
TighMacFanatic
aede4d80e8
Fix for people setting object name to nothing so that you can still click in chat to find out who and where.
2011-05-28 21:45:05 -04:00
TighMacFanatic
da23cd1f42
More updates to preferences UI and bug fixes.
2011-05-28 21:31:35 -04:00
Shyotl
566b3f162e
Updated hud projection matrix functions in llviewerdisplay.
2011-05-28 20:18:58 -05:00
Shyotl
49b893c806
Removed most OGPX related code.
2011-05-28 17:11:10 -05:00
Shyotl
7851a6f38d
Light-projection textures should now appear in deferred. Still need to port the UI in the edit panel, however.
2011-05-28 01:51:01 -05:00
Shyotl
1bc0c5e795
Ensure face being edited/selected actually exists.
2011-05-28 01:49:54 -05:00
Shyotl
799fe056a8
Some nice dist^2 vector length checks to save from squarerooting.
2011-05-28 01:49:32 -05:00
Shyotl
71eec1caed
Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred.
2011-05-28 01:46:11 -05:00
Shyotl
2f3a8fb6c0
Fixing some issues with high-res snapshots.
2011-05-27 14:01:23 -05:00
TighMacFanatic
139a3d35bb
Further updates to preferences for bug fixes and user friendliness.
2011-05-26 00:20:45 -04:00
Aleric Inglewood
e41fd0d978
Add comments regarding the colors and meanings of sound beacons.
2011-05-25 20:16:59 +02:00
Aleric Inglewood
f8c3617540
Merge branch 'master' into V2Renderer
2011-05-25 20:12:30 +02:00
Aleric Inglewood
e3742734f0
Beacons (floater) fixup
...
After a user spend three days trying to find out why certain
textures looked red (as if they had alpha and you pressed
control-alt-T, but not all of them were like that); and nothing
helped, not relogging, not clearing cache, not even reinstalling
the viewer... I decided to take this bug serious. Note that,
according to Shyotl, there have been more users every now and
then that reported this problem.
The problem (after doing a research for 1 hour) turned out
to be that she had beacons on, highlighting prims with scripts.
The immediate bug is, of course, that this was persistent over
a relog. Upon further investigation, this bug exists because
a Debug Setting had a double meaning: it meant both "beacon
floater is visible", which you want to be persistent, and it
was later renamed and given the meaning "Keep beacons when
closing the floater". Digging deeper it turned out that there
was a REAL mess with regard to the beacons: A non-finished
floater with immature comments (called "dingdong floater") was
half-created and replaced the original floater which, according
to the comment was "so fucked over and over" (== commented out
in several places), but then everything was commented out and
replaced with a menu (because they couldn't get it to work?).
The floater simply didn't exist anymore! That reduced the
meaning of the Debug Setting to "Show beacons", although you
now could only set it in the menu by clicking on "Beacons Always On"
where 'Always' refers to also on when the floater isn't there.
I nuked the immature dingdong code, brought back the original
floater as it was in snowglobe (and still is in Imprudence),
fixed it up a bit with a nicer layout (indentation and spacing)
and disabling (graying out) when needed, and added a new checkbox
that will allow people to still keep/see the beacons after closing
the floater.
In the end this requires THREE Debug Setting variables:
ShowBeaconsFloater : TRUE when the floater is visible, FALSE when not.
This is persistent, so the floater is still
there if you relog with the floater open.
BeaconsKeepVisible : TRUE when the new checkbox is checked.
Also persistent.
BeaconsVisible : TRUE when the beacons are rendered, FALSE otherwise.
This is NOT persistent: we don't want unsuspecting
users to try and get rid of the weird 'red prims'
by relogging and failing at that.
2011-05-25 19:55:42 +02:00
Shyotl
45d84f88ab
Frames were occasionally failing to flush, resulting in odd stutters. Forcing flushes.
2011-05-24 23:13:48 -05:00
Shyotl
4ee4d52b2f
Added bokeh DoF. Fixed some several SSAO and shadow combinations. Fixed GI crash bug. Enabled several fasttimers. Updated shaders.
2011-05-24 20:31:17 -05:00
Aleric Inglewood
b82c94383b
Make V2Renderer branch compile.
2011-05-24 18:56:53 +02:00
Aleric Inglewood
d27abe5ed8
Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer
2011-05-24 18:10:21 +02:00
Shyotl
34f252f52e
Updated featuretables. Ultra now enables deferred except without shadows. Also cleaned up to work with renamed/removed settings.
2011-05-22 22:27:27 -05:00
Aleric Inglewood
8ee4ed96b7
Merge branch 'master' of https://github.com/siana/SingularityViewer
...
Resolved Conflicts:
indra/llcommon/aithreadsafe.h
Manually added patch had trailing space more.
2011-05-22 22:42:24 +02:00
Aleric Inglewood
820337f75b
Merge remote-tracking branch 'shyotl/AlericMaster'
2011-05-22 22:38:46 +02:00
Aleric Inglewood
13560e292e
Added AIFetchInventoryFolder and more.
...
Added a new statemachine AIFetchInventoryFolder, which can be used
to fetch the contents of a folder by name or UUID.
Also added AIEvent (and one event,
AIEvent::LLInventoryModel_mIsAgentInvUsable_true, which is needed
for AIFetchInventoryFolder).
Fixed LLInventoryModel::sBackgroundFetchActive to correctly reflect
whether or not LLInventoryModel::backgroundFetch is added to
gIdleCallbacks.
Avoid duplicated entries in sFetchQueue.
Reset sFullFetchStarted in LLInventoryModel::stopBackgroundFetch to
allow for a renewed full fetch when some single-folder fetch stops it.
Added AIStateMachine::mQueued to make calling 'cont()' more robust:
calling cont() / idle() / cont() on a row would otherwise add a
statemachine twice to the active list, which would cause a crash
when it's killed.
2011-05-22 22:01:11 +02:00
Shyotl
21498e0486
Cloud rendertype toggling should now actually... toggle.
2011-05-22 00:12:25 -05:00
Shyotl
7a907c4448
RenderLightingDetail renamed to RenderLocalLights. Toggling light level should work now. RenderDeferredFullscreenLights removed.
2011-05-22 00:11:12 -05:00
Shyotl
0785d392e3
Crashfix for LL's recent changes to flexi updating. May revert entire changeset if more oddities are found.
2011-05-21 00:14:46 -05:00
Shyotl
127dd659fa
Updated graphical options panel to work with new setting configuration.
2011-05-21 00:13:38 -05:00
Shyotl
c029f00e12
CURL easy handles are now cached for reacquisition. Should lessen hitching by about half on systems exhibiting such.
2011-05-20 19:03:43 -05:00
Shyotl
285c19090e
Slightly smarter flexi update handling, plus extra nullchecks.
2011-05-20 16:07:47 -05:00
Shyotl
9a29428b39
Replaced obsolete priority spatial queue lock with new group-specific variants
2011-05-20 15:51:45 -05:00
Shyotl
77f09744ab
Merge branch 'AlericMaster' into V2Renderer
...
Conflicts:
indra/llcommon/aithreadsafe.h
indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
Shyotl
dff4e97c80
Merge branch 'master' into V2Renderer
2011-05-20 12:38:53 -05:00
Shyotl
cf6668cb7a
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-20 12:38:36 -05:00
Shyotl
179885d120
basic_plugin_filepicker now dependancy of secondlife-bin. Added missing windows build step required to place copy of filepicker dll in required directory.
2011-05-20 12:33:30 -05:00
Shyotl
6c3cd6d428
Conditionally allocate deferred renderbuffers.
2011-05-20 10:20:11 -05:00
Shyotl
8562fae08b
LLPipeline::rebuildGroups() optimized a bit.
2011-05-19 22:38:51 -05:00
Shyotl
cc60a94af6
Workaround for flickering objects in water reflection pass.
2011-05-19 21:24:46 -05:00
Shyotl
1bb009dcf7
Using new LLLightState class instead of direct glLight calls, also other misc cleanup.
2011-05-19 18:56:49 -05:00
Shyotl
503b99c54e
Preference panel was not correctly referring to AcentHideTypingNotification.
...
Removed dead code regarding HideTypingNotification.
2011-05-18 23:41:42 -05:00
Shyotl
754bb38169
Exposed 'RenderPreferStreamDraw'
...
Don't enable AA in deferred/ui/etc unless AA is actually enabled via setting
Standard c array instead of silly vector, since the size is knowable at compile.
2011-05-18 21:01:26 -05:00
Shyotl
7ba10207a4
Belly physics shouldn't have been set to female-only. Eups.
2011-05-18 20:19:09 -05:00
Shyotl
147afb922d
Disabled FBO toggle in hardware options panel if in deferred mode... because turning fbos off in deferred is... bad.
2011-05-18 20:07:08 -05:00
Shyotl
4663b605ef
Added fullbright shiny underwater shader.
2011-05-18 17:00:44 -05:00
Shyotl
a4b7bbd031
More should-be-safe changes. Prep for pipeline work.
2011-05-18 16:04:46 -05:00
Shyotl
0193173e46
Added #version string to many shaders. Added a few to-be-implemented shader files
2011-05-18 14:58:57 -05:00
Shyotl
90c0ea63b1
index on V2Renderer: 5f6fc78 llmath and llcommon updates. Marginal.
2011-05-18 14:36:56 -05:00
Shyotl
5f6fc78706
llmath and llcommon updates. Marginal.
2011-05-18 14:36:05 -05:00
Shyotl
62e3aa10c1
Reasonably safe changes.
...
Using accessor for vertexbuffer in LLFace
Extra occlusion query lookup in llgl (unused)
Const changes.
2011-05-18 14:35:27 -05:00
Siana Gearz
1327c80dd7
Don't assume we have perftools
2011-05-18 15:41:14 +02:00
Aleric Inglewood
e1fb1fa6b7
API change of AIFilePicker.
...
Call AIFilePicker::create() instead of new AIFilePicker.
Renamed deleteMe() to kill() and bs_deleted to bs_killed.
Only default to auto destruct when created with create(true),
otherwise kill() has to be called explicitely.
2011-05-18 03:52:15 +02:00
Shyotl
b314172533
Merge branch 'master' into V2Renderer
2011-05-17 16:39:43 -05:00
Aleric Inglewood
4eb87268bd
Don't error when fmod isn't installed (same as Darwin does).
2011-05-17 22:52:35 +02:00
TighMacFanatic
3dff6922c2
Added missing settings*.xml files to CMakeLists.txt.
2011-05-17 13:07:32 -04:00
TighMacFanatic
c3a38c1704
Settings names unbotch.
2011-05-17 12:58:05 -04:00
TighMacFanatic
2b412bffec
Updated preferences system for bug fixes and user friendliness.
2011-05-17 12:54:30 -04:00
Aleric Inglewood
3656939269
Cancel pose stand when quitting.
...
This fixes the bug that if you Quit while in the Singularity -> Pose
Stand, then you are permanently hovering over the group until you go
into Advanced -> Debug Settings and reset AscentAvatarZModifier.
It also fixes that before, when you changed AscentAvatarZModifier
in Advanced -> Debug Settings then you saw no effect (until the
viewer would sent an AvatarAppearance message.
After this patch, changing any of the AscentAvatar*Modifier settings
has immediate visible effect, and a pose stand (Z-offset) is reset
when quitting.
2011-05-17 02:42:06 +02:00
Aleric Inglewood
addb7a559e
Generalize how -fPIC is added, even in cwdebug.
...
Although the file is empty when not compiling with CWDEBUG,
windows doesn't like the -fPIC there.
2011-05-16 23:49:03 +02:00
Aleric Inglewood
10af185abc
Add Advanced --> Character --> Meshes and morphs...
...
Allows to save the .llm of all mesh objects, and
all morphs of each as .obj (Wavefront OBJ File),
for import in, for example, blender.
You can also load .obj files, but of course they
will only affect what you see locally.
2011-05-16 19:03:48 +02:00
TighMacFanatic
14dd55a035
Bug fix on Avatar Cloth setting not working properly.
2011-05-16 00:26:31 -04:00
Shyotl
1a2d75fbe6
LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from
2011-05-15 22:50:56 -05:00
Shyotl
fe372028dc
Shuffled LL_COMMON_API around in spots to match v2
...
Added llformat_to_utf8
Added LLProcessLauncher::getExecutable()
LLStringTableEntry() ctor and dtor definitions moved from .h to .cpp
(should be safe)
2011-05-15 22:47:23 -05:00
Shyotl
51338470b5
Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp
...
LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere)
LLEventTimer now using LLInstanceTracker
Updated LLLiveAppConfig (Though it appears unused, really)
processor.h is obsolete, thus removed. (llprocessor.h replaces it)
2011-05-15 22:40:59 -05:00
Shyotl
e3435d7ef9
Slight llcharacter updates from v2 (should be safe)
2011-05-15 22:22:22 -05:00
Shyotl
37c5016c2f
LLAssetType lookup now done through LLDictionary.
2011-05-15 22:17:15 -05:00
TighMacFanatic
990fe86438
Merge branch 'FloaterPositions'
2011-05-15 20:13:26 -04:00
Siana Gearz
742ecf395f
One last GCC 4.6 stopgap
2011-05-16 02:12:46 +02:00
TighMacFanatic
9706141b8f
Tweaked Pay floater to not have overlapping elements.
2011-05-15 20:12:43 -04:00
Siana Gearz
adeba18356
GCC 4.6 fixes
2011-05-16 01:37:00 +02:00
Aleric Inglewood
00f8c35614
Some minor additional changes (filepicker)
2011-05-16 01:26:43 +02:00
Aleric Inglewood
1c21b2c18a
Merge remote-tracking branch 'shyotl/AlericMaster'
2011-05-15 23:14:03 +02:00
Aleric Inglewood
93fdc2c89e
Speed up of LLViewerObjectList::cleanDeadObjects with a factor of 10000.
...
Also a little review of Dead objects in general.
The old code was calling 'erase' on a large vector, once for
every dead object (which are a lot, especially if you exit or
teleport), causing the whole (large) vector to be copied every
time. The new code only calls erase once per call (about once
a second at most now), erasing 20 to 100 objects at the END
of the vector. This is INCREDIBLY faster.
2011-05-15 23:02:44 +02:00
Siana Gearz
3abc778f2c
Empty splash page workaround
2011-05-15 20:19:26 +02:00
Siana Gearz
bd153fc68f
Public Thread Safety notice:
...
<add a cheesy cooment here>
2011-05-15 14:24:15 +02:00
Shyotl
461ddb2ca9
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
2011-05-14 22:31:35 -05:00
Shyotl
3926d2d30a
Resolved most errors under vc100 compiler
2011-05-14 22:30:30 -05:00
Aleric Inglewood
4e68f5878a
Add missing AIReadAccessConst initialization of mIsCopyConstructed
2011-05-15 05:03:34 +02:00
Aleric Inglewood
697f0ad054
Old VWR-14914 spin-off sound beacon patch.
...
This makes sound beacons green when playing at
full volume, yellow when playing at a lower volume
and red when they are muted (aka, in another parcel
that you can't hear the sounds of).
Originally this was a debug patch as muted sound
sources used to be implemented by setting the volume
to zero, which happens to use like three times more
CPU: so, having a lot of muted sound source caused
the audio thread to never release a mutex anymore
(cause it was never idle anymore), causing the main
loop to hang, waiting on that mutex - dropping the
FPS drastically. Hence it was necessary to see which
sound sources were muted for debugging purposes.
(Since VWR-14914, muted source source are not played
at all anymore, so they do not take extra CPU).
It's still fun to see this extra information though,
now the patch exists anyway.
2011-05-15 02:23:13 +02:00
Aleric Inglewood
2d648c1da0
Workaround for windows compiler bug.
...
Visual C++ compiler doesn't like to take a pointer to a variable
in the argument list of that variable when it is being declared.
2011-05-14 23:43:19 +02:00
Shyotl
66c9e3e1b4
Merge branch 'master' into V2Renderer
...
Conflicts:
indra/newview/llvoavatar.h
2011-05-14 14:03:25 -05:00
Shyotl
fb14aff1f6
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
2011-05-14 14:01:58 -05:00
TighMacFanatic
9f3c4c1021
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-05-14 14:21:17 -04:00
Shyotl
4e47446be1
LLVOAvatar class members reorganized to line up with V2 better. Added accessors from v2 where applicable. mBakedTextureData renamed to mBakedTextureDatas
2011-05-14 12:38:47 -05:00
Aleric Inglewood
1bc876542c
Avoid possible crash on opensim.
...
See http://redmine.kokuaviewer.org/issues/582
This happened only on opensim. The fixed was made
basically by MichelleZ. It doesn't harm anything, so
even though it appears to never happen on Agni
and it is unknown what bug is causing it, it make the
viewer resilient just-in-case...
2011-05-14 19:38:03 +02:00
Siana Gearz
32594cd651
Version 1.5.8(1)
2011-05-14 03:27:08 +02:00
Aleric Inglewood
dc9465a521
Old work around for a bug we never found...
2011-05-14 02:45:04 +02:00
Aleric Inglewood
74b58b7b3c
Stop the viewer from crashing when someone puts a callingcard in a notecard.
...
This crashed me (on imprudence) because someone gave me a notecard
with a calling card in it.
2011-05-14 02:33:11 +02:00
Aleric Inglewood
675ef17d92
Bug fix: don't loop endlessly when getParentFloater returns it's argument.
...
It has happened to me that this hung the viewer. The cause is that
when you call parent->getParentFloater(child), then getParentFloater
which starts like this:
LLFloater* LLFloaterView::getParentFloater(LLView* viewp)
{
LLView* parentp = viewp->getParent();
starts with parentp == this. And the following logic causes
it to return 'viewp'!
I'm pretty sure that getParentFloater's whole design is wrong,
but I don't see another way to avoid this problem then with
this hack, except by making changes that do a lot more and
are a risk with regard breaking code elsewhere.
2011-05-14 02:22:37 +02:00
Aleric Inglewood
4c9d9d44a4
Add 'Save As...' back to snapshot floater.
2011-05-14 01:34:27 +02:00
Aleric Inglewood
41f13dbf46
Merge branch 'master' of https://github.com/siana/SingularityViewer
...
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.
Resolved Conflicts:
indra/llcommon/CMakeLists.txt
Proximity: addition of two independent things. Just included both.
2011-05-14 01:06:19 +02:00
Siana Gearz
8df737b488
Not pretty, but i damn know this escaper works
2011-05-14 00:38:43 +02:00
Aleric Inglewood
ea2cc3e0de
Make FilePicker context sensitive default paths persistent over logins.
...
Also, make newview/statemachine a separate project.
2011-05-13 23:50:56 +02:00
Siana Gearz
ea31271ac1
Version 1.5.8
2011-05-13 20:27:34 +02:00
Siana Gearz
72a502eee4
Make radar readable
2011-05-13 15:13:07 +02:00
Siana Gearz
5aa145cc02
Merge git://github.com/narv/SingularityViewer
2011-05-13 13:26:33 +02:00
Siana Gearz
def7d1052c
Merge git://github.com/Shyotl/SingularityViewer
2011-05-13 13:21:11 +02:00
Shyotl
a3ac5a43b3
Changed how the enabled state for the deferred checkbox is handled in the graphics floater
...
It now is disabled if:
-Lacking hardware support for FBOs
-RenderDeferred not permitted in gpu feature table
-RenderAvatarVP not permitted in gpu feature table
-VertexShaderEnable is enabled and permitted in gpu feature table
-WindLightUseAtmosShaders is enabled and permitted in gpu feature table
Enabling deferred now requires WindLightUseAtmosShaders to be on beforehand, instead of blindly enabling it.
2011-05-13 02:26:14 -05:00
Shyotl
40d813699b
Added Framebuffer Object checkbox to 'Hardware Options' floater.
2011-05-13 02:21:43 -05:00
Shyotl
ccce2a0641
Combox for reflection detail was not initializing to correct selection.
2011-05-13 02:20:50 -05:00
Shyotl
632a0b3e1f
Merge branch 'master' into V2Renderer
2011-05-12 19:29:20 -05:00
Shyotl
8ac9da7bc8
Disabling buggy old occlusion tweak. Unstable on nVidia.
2011-05-12 19:03:59 -05:00
Shyotl
534e1ae733
DeferredHighPrecision test setting to test 16bit framebuffers vs 32bit
2011-05-12 18:59:05 -05:00
Shyotl
9e2db6bc40
General cleanup
2011-05-12 18:55:26 -05:00
Shyotl
9cac5233af
Setting the correct variable on Physics LOD setting change sounds like a good idea.
2011-05-13 01:16:20 +02:00
Siana Gearz
0b25aa8ed5
Updated libpng (windows) and ogg/vorbis (all)
2011-05-13 01:01:59 +02:00
Shyotl
f45c3e2b1f
Setting the correct variable on Physics LOD setting change sounds like a good idea.
2011-05-12 17:53:41 -05:00
Aleric Inglewood
3774547367
Redo the copyconstructor hack for AI*Access objects.
...
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.
The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-13 00:37:47 +02:00
Shyotl
2c1a46c70d
A stability and leak fix regarding editing physics wearables. Thanks Henri!
2011-05-13 00:36:04 +02:00
Shyotl
b6446cad10
A stability and leak fix regarding editing physics wearables. Thanks Henri!
2011-05-12 16:13:04 -05:00
Siana Gearz
4d9e7fa8c1
Deferred settings
2011-05-12 22:10:10 +02:00
TighMacFanatic
3a60326ad5
Merge branch 'spamui'
2011-05-12 14:10:00 -04:00
TighMacFanatic
e098ec7d46
Merge branch 'FloaterPositions'
2011-05-12 14:09:53 -04:00
TighMacFanatic
e2a220ac3c
Tweaks to UI sizes so they fit better
2011-05-12 14:08:57 -04:00
TighMacFanatic
3f426fcb67
Added Open History button to local chat
2011-05-12 13:35:31 -04:00
TighMacFanatic
3fbc4a1dba
Added money transactions to local chat
2011-05-12 13:35:08 -04:00
Aleric Inglewood
5f72cbb103
Add support for flushing messages from plugin to viewer.
...
Actually flush messages before terminating a plugin (upon
the shutdown message) and flush messages in the file- and
dirpicker before opening the blocking dialog. Flush debug
messages too (deeper into the code, just prior to the actual
blocking call).
Also, fix the context folder map to be a thread-safe
singleton and *attempt* to add support for default folders
to windows and Mac. The latter might even not compile yet
and definitely have to be tested (and fixed):
Opening a DirPicker in preferences --> Network and Set
the directory location of the cache. It should open a
Dialog window where you are already in the folder that
is the current cache directory setting (you can click
Cancel after verifying that this worked).
And, start to upload an image, select a file is some
directory (other than what it starts in). You can omit
the actual upload by clicking cancel in the preview.
Then upload again and now it should start in the same
folder as that you were just in. Possibly you need to
first open a file picker elsewhere with a different context
though, or windows might choose to open in the last
folder anyway while the code doesn't really work. Uploading
a sound before the second texture upload should do the
trick.
2011-05-12 18:22:51 +02:00
narv
ebe7053526
Version 1.5.7(2)
2011-05-12 07:50:34 -07:00
narv
981e4f39b2
Revert to build llcommon on Darwin
2011-05-12 07:41:49 -07:00
Siana Gearz
6d5d90bd92
Merge branch 'spamui' of git://github.com/TighMacFanatic/SingularityViewer
2011-05-12 15:16:17 +02:00
narv
636ef25eef
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-05-12 01:24:54 -07:00
Shyotl
ba8e62841f
Deferred class2 alpha shader should actually compile now.
2011-05-12 00:13:44 -05:00
Shyotl
d1d6994419
Full v2.6 renderer.
2011-05-12 00:13:38 -05:00
TighMacFanatic
f83c10208e
Spam settings UI page
2011-05-12 00:39:06 -04:00
Siana Gearz
50310ba263
Merge git://github.com/Shyotl/SingularityViewer
2011-05-12 00:57:03 +02:00
Siana Gearz
b3847fdeed
Build fixes
2011-05-11 23:06:49 +02:00
Siana Gearz
29feeccf0d
Minimap fluke fix, thx Aleric
2011-05-11 23:06:19 +02:00
Siana Gearz
6b61e2dd2a
Fix linkage in debug build on Windows
2011-05-11 12:47:24 +02:00
Aleric Inglewood
38b33328e6
Redo the copyconstructor hack for AI*Access objects.
...
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.
The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-11 03:47:42 +02:00
Aleric Inglewood
a6cb676d4a
Add AIDirPicker and use it. Remove indra/newview/ll{dir,file}picker.{h,cpp}.
...
Also removed some code from the Mac/windows code in
indra/plugins/filepicker/llfilepicker.cpp that shouldn't
be in there anymore (send_agent_pause/resume and updating
the LLFrameTimer stuff).
2011-05-11 03:01:34 +02:00
Shyotl
b61b0ca932
ShowLookAt now depth-tested
2011-05-10 13:52:59 -05:00
Siana Gearz
b81cfb2c4f
Version 1.5.7(1)
2011-05-10 14:51:27 +02:00
Siana Gearz
eeeb44755a
Make minimap not die on dead objects
2011-05-10 13:50:44 +02:00
Aleric Inglewood
fa51d52578
Workaround for gcc 4.2.x.
...
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.
g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 13:47:17 +02:00
Aleric Inglewood
133391be90
Merge branch 'master' of https://github.com/siana/SingularityViewer
...
Resolved Conflicts:
indra/newview/llviewermedia.cpp
indra/plugins/base_media/CMakeLists.txt
Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
2011-05-10 04:46:58 +02:00
Aleric Inglewood
e0b0fa4f58
Use AIFilePicker everywhere.
...
Also upgrade the file picker filters with the new extensions found
in the orginal file picker code of Singularity.
Also improve AIFilePicker a bit: added hasFilename() and now
deleting the statemachine automatically by default: it's no longer
needed to call deleteMe from the callback.
2011-05-10 04:27:57 +02:00
TighMacFanatic
107c3cb70a
Merge https://github.com/TighMacFanatic/SingularityViewer
...
Conflicts:
indra/newview/CMakeLists.txt
indra/newview/app_settings/settings.xml
2011-05-09 22:06:00 -04:00
Aleric Inglewood
81550aa6de
Workaround for gcc 4.2.x.
...
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.
g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 03:11:48 +02:00
Siana Gearz
8227efcaf1
Make our build and packaging shine again
2011-05-09 13:35:51 +02:00
Shyotl
005507c891
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-09 00:15:20 -05:00
Siana Gearz
2ca4d1bf64
Merge branch 'AlericMaster' of git://github.com/Shyotl/SingularityViewer
2011-05-09 00:49:21 +02:00
Siana Gearz
e371c2e93d
Repo cleanup. Sheesh, who packaged pics with a lib?
2011-05-09 00:40:38 +02:00
Siana Gearz
8d2b56b1eb
Fixed prebuilt fetching, Snowglobe style
2011-05-08 23:25:21 +02:00
Shyotl
2529644e90
Should now compile on VC100 again.
2011-05-08 16:25:03 -05:00
Shyotl
1a099167ae
Fixing Win compile. (Partial)
2011-05-08 20:34:32 +02:00
Shyotl
0638fafe66
Fixing Win compile. (Partial)
2011-05-08 12:46:42 -05:00
Siana Gearz
e2e576e550
Merge git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00
Aleric Inglewood
75ff0fc04d
Add more support for debugging plugins.
...
Added support for plugin debug messages and better error reporting
when something goes wrong during start up of SLPlugin.
Also added more debug output regarding general plugin messages
as well as debug output related to AIFilePicker.
2011-05-08 17:49:06 +02:00
Aleric Inglewood
80bbf5d083
Fix underlinkage of libmedia_plugin_gstreamer.so
...
Needed for the newer plugin code. This is basically just a copy
of indra/cmake/GStreamer010Plugin.cmake from Imprudence.
2011-05-08 17:32:05 +02:00
Aleric Inglewood
c46c86ca4b
Split plugin classes and derive AIFilePicker from BasicPluginBase (part 4).
...
Add back fixes that were in Singularity (in indra/media_plugins) but not
in imprudence.
Also:
Add "shutdown" plugin message and terminate file picker plugins cleanly.
The DSO (libbasic_plugin_filepicker.so) now tells the child process /
plugin loader (SLPlugin) to terminate (using the 'shutdown' message),
and AIFilePicker::finish_impl destroys the plugin object on the viewer
side when it's ... finished thus.
Also added a large comment that gives an overview of all classes
involved on the viewer side.
Additional fixes for filepicker.
Plugin refactor bug fix: mDeleteMe was uninitialized in AIPluginFilePicker.
2011-05-08 17:30:43 +02:00
Aleric Inglewood
16cd4c5c4b
Split plugin classes and derive AIFilePicker from BasicPluginBase (part 3).
...
This commit deletes all indra/media_plugins and copied one-on-one
the indra/plugins directory from my (imprudence) statemachine branch
(which contains the AIFilePicker patch).
git shows this as a lot of 'renamed' files because originally it
was a rename. However, there are a lot of changes as well: it's both
an upgrade to a newer plugin system (changes by LL) as well as an
upgrade to my refactored plugin system with a file picker as plugin.
Since this commit is a one-on-one copy, it disregards any changes
that were in Singularity and not in imprudence in indra/media_plugins
however. I will add those back in the next commit.
2011-05-08 17:10:39 +02:00
Aleric Inglewood
784fdd4f37
Split plugin classes and derive AIFilePicker from BasicPluginBase (part 2).
...
This commit contains all changes to indra/llplugin.
Since there were no differences at all between Singularity and
imprudence before this patch, it's a perfect port.
2011-05-08 17:10:38 +02:00
Aleric Inglewood
e89d6d9d66
Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
...
This commit contains all changes, except those in indra/media_plugins
(which was renamed to indra/plugins) and indra/llplugin.
However, it does contain the (new) file
indra/plugins/filepicker/basic_plugin_filepicker.cpp
2011-05-08 17:10:38 +02:00
Aleric Inglewood
f6b57d956d
Added base class AIStateMachine.
...
This is the skeleton needed to implement classes that can be reused and
work together, which can perform asynchronous tasks (read: need to wait
for certain events before they can continue).
An example would be the task of waiting for a given inventory folder to
be read. This could then be used to improve the builtin AO
(automatically reading that folder when a notecard is dropped, and
continuing when the whole folder is read).
It's first use will be communication with a filepicker that runs
in a plugin.
2011-05-08 17:08:48 +02:00
Aleric Inglewood
474acdbff9
Add support for libcwd.
...
This patch has no influence if you don't have libcwd installed.
Note that libcwd (http://libcwd.sourceforge.net/ ) is only
available for linux.
A default compile of libcwd does memory allocation tracking,
which is too slow for everyday usage of the viewer (usable,
but notably slower) and we don't need that. Configure your
libcwd as follows:
./configure --prefix=/sl/usr --disable-alloc --enable-optimize
Or whatever prefix you prefer (add --enable-maintainer-mode
if you're compiling it from the SVN repository), add
--disable-nonthreading to compile twice as fast.
If you have it installed you can activate it's use by setting a
few environment variables:
CXXFLAGS="$(pkg-config --cflags libcwd_r)"
LDFLAGS="$(pkg-config --libs libcwd_r) -lpthread"
and then reconfiguring the viewer.
The -lpthread is needed when using ld.gold, however, if you
leave it out you might get an LDFLAGS that ends on trailing
whitespaces, which doesn't work for some reason.
Also, if you installed it in a non-standard place (/sl/usr
above) then you need this to run the viewer (and tests):
export LD_LIBRARY_PATH="/sl/usr/lib"
2011-05-08 17:08:48 +02:00
Aleric Inglewood
3a1d753344
Use LL_DEBUG_TERMINAL_COMMAND and LL_DEBUG_GDB_PATH
...
Upgraded the code that attaches gdb to a plugin for linux
to the code that I wrote for viewer 2.
2011-05-08 17:08:47 +02:00
Aleric Inglewood
111c671a21
Also strip libraries on x86_64, which uses lib32 and lib64 directory names
2011-05-08 17:08:47 +02:00
Siana Gearz
7e75a897ca
Release 1.5.7
2011-05-08 16:46:12 +02:00
Siana Gearz
de1a86004d
This should fix media
2011-05-08 16:15:20 +02:00
Siana Gearz
205a11d44b
Merge git://github.com/Shyotl/SingularityViewer
2011-05-08 14:46:28 +02:00
Shyotl
faf86fdf24
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into AlericMaster
2011-05-07 23:48:28 -05:00
Shyotl
c5917d79c7
Resetting media texture reference timer on update call to prevent purging from texture list while still in use. Keeping nullcheck just to be safe. (Broken video is preferable to a crash)
2011-05-07 21:49:48 -05:00
Siana Gearz
63b0bf0f30
New tcmalloc, just in case old one has VC10 bugs
2011-05-08 00:51:53 +02:00
Siana Gearz
82478d4ef2
Apparently some of those is needed on Windows, and it was shoddy
2011-05-08 00:51:00 +02:00
Shyotl
2a9e7ec5f7
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-07 17:24:36 -05:00
Shyotl
7e16e0624a
Scare everyone with a big-arsed warning. Horray!
2011-05-07 01:41:28 -05:00
Siana Gearz
e3f9b4dbbe
Help me keep track of VBOs
2011-05-07 05:47:13 +02:00
Siana Gearz
0903241b8f
Merge git://github.com/Shyotl/SingularityViewer
2011-05-06 13:50:20 +02:00
Shyotl
779fe9cfaa
General cleanup. Potential line-width inconsistency tweak. Wearable creation cleanup.
2011-05-06 00:20:41 -05:00
Siana Gearz
f052915f54
Fix name in grant/ungrant edit right. Issue 33
2011-05-06 04:34:32 +02:00
Aleric Inglewood
0fa396938b
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-05-05 15:54:21 +02:00
Aleric Inglewood
92696623e0
Start up crash of LLErrorThread due to corrupt map in CheckLevelMap
...
Wrapped gSettings and the global objects returned by Settings::get() and
Globals::get() in AIThreadSafe, forcing thread-safe access.
This solves the problem of possible corruption of the various LevelMap's
in LLError::Settings due to thread unsafe accesses.
2011-05-05 15:41:19 +02:00
Siana Gearz
e6db03054b
Merge git://github.com/Shyotl/SingularityViewer
2011-05-05 03:28:55 +02:00
Siana Gearz
eedc1f79ec
Resolve stray VC8 CRT dependency by updating libs
2011-05-05 03:20:54 +02:00
Shyotl
5b36f29b76
LLViewerObject::setPosition already calls updateDrawable. Removing extra updateDrawablecalls.
...
Referring to cam axis byref.
2011-05-04 19:56:55 -05:00
Shyotl
96f400eb4c
LLViewerObjectList::mDeadObjects has no reason to be a std::map any longer. Converted to std::set as per v2.
2011-05-04 19:55:17 -05:00
Aleric Inglewood
86a19e8e91
IMP-701: An API to wrap objects for thread-safe access.
...
See http://redmine.imprudenceviewer.org/issues/701
2011-05-05 02:54:38 +02:00
Shyotl
8cc6092a1c
A few variables were uninitialized.
...
Removed an unused variable.
Phys controller that should be female-only... wasn't.
Pre increment iterators when possible.
protected->private upgrades.
2011-05-04 19:54:03 -05:00
Aleric Inglewood
4d932d5e2d
Added a thread-safe and robust wrapper for APR pools.
...
See http://redmine.imprudenceviewer.org/issues/590
and https://jira.secondlife.com/browse/SNOW-596
2011-05-05 02:52:55 +02:00
TighMacFanatic
fbb1425ef5
Merge branch 'keyword'
2011-05-04 18:06:02 -04:00
Aleric Inglewood
5b08560047
Update of doc/contributions.txt with patches from snowstorm already in Singularity.
2011-05-04 22:23:49 +02:00
Siana Gearz
4666e29fb7
install Hunspell dictionaries
2011-05-04 21:10:59 +02:00
Aleric Inglewood
f2199a504b
More various small, old patches.
...
Updated source tree to include everything I did
up till 2010-11-09.
Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.
2011-05-04 19:48:16 +02:00
Aleric Inglewood
ab5915c16c
LindenUserDir fixes.
...
Patch from 2010-10-20/22. Didn't apply cleanly so I redid it
manually and tested/checked it. There was only one difference
with imprudence: for some reason Singularity tries to see
if the "teleport history" floater is visible while initializing
the menu's, something that imprudence doesn't do. For the rest
the patch is basically the same. Nevertheless, I left all code
exactly as it was in Singularity (the only thing that this
commit changes is the intend of the original patch: in debug
mode, fail with an assertion when LindenUserDir is called while
it is not initialized; and then fix everything to make it work
again.
Original commit message:
The LindenUserDir (~/.imprudence/first_last/) cannot be initialized
before the user logged in. However, several singletons (that only can be
initialized once) depend on this directory for initialization. Therefore
we have to take care not to instantiate those singletons until after the
user logged in.
With regard to webit, this fixes the browser_profile (cache and cookies)
directory that the builtin browser uses.
2011-05-04 17:54:57 +02:00
Aleric Inglewood
ccaa494e85
Updated doc/contributions.txt and added various missing patches from imprudence.
...
This updates the source tree with patches that I committed to
imprudence up till and including 2010-10-19.
2011-05-04 15:52:25 +02:00
Siana Gearz
8983f4a186
Don't crash there.
2011-05-04 14:46:23 +02:00
Shyotl
03c98452be
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-03 18:25:31 -05:00
Shyotl
e50aa5ab88
Disabled general spam blocking until exception is added for delayed instant messages.
2011-05-03 18:24:42 -05:00
Siana Gearz
d611f6b741
Adding hunspell dll/so/dylib
2011-05-04 00:07:32 +02:00
Siana Gearz
44cf222104
Now can offer teleport to anyone
2011-05-04 00:03:55 +02:00
Siana Gearz
90c22d8edf
J2C stream length estimation back to old
2011-05-03 23:53:18 +02:00
Siana Gearz
7d417faaf4
Merge git://github.com/Shyotl/SingularityViewer
2011-05-03 19:34:16 +02:00
Shyotl
c2f0aa53af
PumpIO fasttimer now child of Pump fasttimer (instead of being blindly added to Pump). Aids debugging pumpIO hitching.
2011-05-03 01:15:17 -05:00
TighMacFanatic
1a2663c124
Added setting for storing Avatar Debug Textures floater position.
2011-05-03 01:36:03 -04:00
Shyotl
9ea3032fee
Reverted some preloaded textures to pre-v2 filenames so they are actually found.
2011-05-02 23:15:48 -05:00
Shyotl
3dff32d2ab
Now that depth blitting appears to work, moving hovertext and such to ui render. Also, added depth-culling in a few more spots to hopefully lessen frag shader usage in deferred.
2011-05-02 17:05:06 -05:00
Shyotl
65c2a46121
Workaround for depth+stencil blitting on AMD(Ati) hardware, plus alteration to blitting to framebuffer when using MSAA.
2011-05-02 17:02:44 -05:00
Aleric Inglewood
6848c2df6f
Fix underlinkage of libmedia_plugin_webkit.so
...
Fixed by updating indra/cmake/WebKitLibPlugin.cmake with
version from imprudence.
This commit also contains removal of execute permissions
of source files and configure files, sorry...
2011-05-02 23:13:15 +02:00
Aleric Inglewood
c0c786b39f
Make loading prebuilts work.
...
Copied indra/cmake/Prebuilt.cmake from imprudence,
which fixed this issue.
2011-05-02 20:50:26 +02:00
Aleric Inglewood
1ced64e0b4
Add LLWeb::curlEscape
...
Since curl 7.21.2 - (October 13 2010), curl_escape (a deprecated
function that will be removed in the future) changed it's behavior
and no longer escapes the characters '-', '.', '_' and '~'.
The only reasonable solution for us is to stop using it and
use our own version that mimics the old behavior. The only
other alternative would be to rename every .xml file with
escaped characters in their name upon installation, depending
on the behavior of the installed libcurl (on standalone anyway).
However, if you add to that in the future curl_escape has to
be replaced with curl_easy_escape, which is far from easy to
call as it requires a CURL to be passed for which LL invented
a wrapper in libllmessage, but did hide that (Curl::Easy is
only defined in a .cpp file), then we're better of just using
our own function, which I named LLWeb::curlEscape.
2011-05-02 20:15:50 +02:00
Aleric Inglewood
094587aefd
Make viewer compile on standalone linux x86_64
...
This involves making libllcommon shared, a change
that was not finished for windows/Mac.
More changes are needed to indra/newview/viewer_manifest.py
for those two operating systems, as well as to
indra/copy_win_scripts.
I did not test this on linux 32bit, nor non-standalone
on that OS, either.
I did not check voice (which will very likely not work
anyway on 64bit). And currently the webkit plugin doesn't
work for me, but I'll fix that in a different commit.
2011-05-02 19:40:33 +02:00
Aleric Inglewood
1b4ae2e3b5
Removed generated file mime_types.xml, and fixed indentation in the source files.
...
indra/newview/skins/default/xui/en-us/mime_types.xml should be generated
from mime_types_linux.xml, mime_types_mac.xml or mime_types_windows.xml
by copying it when packaging. Hence, it should never be used.
Note, this is an exact sync with imprudence.
2011-05-02 15:26:49 +02:00
Aleric Inglewood
b7aaef7e91
Set appropriate compiler options for x86_64.
...
Using -march=pentium4 break compilation on 64bit.
A pentium isn't a 64bit cpu.
The used options were copied from imprudence.
2011-05-02 15:15:23 +02:00
Aleric Inglewood
b5a0d80cd7
Merge remote-tracking branch 'origin/master'
2011-05-02 04:39:29 +02:00
Aleric Inglewood
9bcc08df1a
Don't barf when Google PerfTools are not found, but simply disable it.
...
Plus bug fix (missing NOT): in the case that USE_GOOGLE_PERFTOOLS
is not set we DON'T want to build with Google TCMalloc.
2011-05-02 04:36:47 +02:00
Aleric Inglewood
1510d5ff5a
Use linux64 key on x86_64
2011-05-02 04:35:56 +02:00
Aleric Inglewood
5246fc9cdd
Uninstall files of old packages when new packages are installed over an old one.
...
Also automatically add missing -dev symlinks to packages and check SONAME's.
This patch was originally written by me for Imprudence.
2011-05-02 03:51:47 +02:00
Siana Gearz
5fd1312ae0
Restoring grid nickname in manager
2011-05-02 02:21:26 +02:00
Shyotl
b57c3fd6e5
Skin tight clothing fix ala thickbrick: https://bitbucket.org/lindenlab/viewer-development/changeset/fbde1fb8ab65
...
https://jira.secondlife.com/browse/STORM-1147
2011-05-01 18:08:24 -05:00
Shyotl
0cbb9a7078
Iterator fix in llavatarnamecache.cpp from v2.
2011-05-01 17:24:37 -05:00
Shyotl
2cf645e8e8
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-05-01 16:35:09 -05:00
Siana Gearz
50f6d7b677
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2011-05-01 23:11:38 +02:00
Shyotl
65199d103a
Merge branch 'V2AvatarPhysics'
2011-05-01 16:09:17 -05:00
Siana Gearz
2ba1dbf9da
Unbotch Aleric
2011-05-01 23:04:18 +02:00
Siana Gearz
38849c1328
Merge git://github.com/AlericInglewood/SingularityViewer
...
Conflicts:
indra/newview/CMakeLists.txt
indra/newview/app_settings/settings.xml
2011-05-01 22:55:18 +02:00
Aleric Inglewood
26c40255aa
Remove CR from configuration, source and xml files.
2011-05-01 22:16:05 +02:00
Aleric Inglewood
7edb98743d
Add missing cmake/FindLLQtWebkit.cmake
2011-05-01 22:04:28 +02:00
Aleric Inglewood
6b8a12dd06
Rename FindZLIB.cmake to FindMyZLIB.cmake to avoid cmake warning.
2011-05-01 22:01:02 +02:00
TighMacFanatic
56c357911e
Chat keyword highlighting
2011-05-01 02:31:05 -04:00
Shyotl
d8caa6a980
Typo effed things up and blocked instant-messages all willy-nilly.
2011-05-01 01:29:55 -05:00
Shyotl
ea10825c27
Typo effed things up and blocked instant-messages all willy-nilly.
2011-05-01 01:28:50 -05:00
Shyotl
a8f4b3ed4a
Merge branch 'master' into V2AvatarPhysics
2011-04-30 22:41:25 -05:00
Shyotl
09133307a1
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-04-30 22:41:08 -05:00
Siana Gearz
ae50fc4404
GCCified SH_SpamHandler
2011-05-01 04:57:44 +02:00
Shyotl
cff618f67d
Doubleclick focus on avatar radar.
2011-04-30 21:46:01 -05:00
Siana Gearz
1d90b8624b
Updated LSL keywords
2011-04-30 23:28:28 +02:00
Shyotl
6cf9c3b4ed
Demoted llerrs to llwarns in HippoGridManager::saveFile() to prevent forcing the client to crash on connect if something goes wrong there(Have had a few reports of this llerrs popping up for people on XP). Failure to save is non-critical.
2011-04-30 16:01:10 -05:00
Shyotl
226de66b81
Skip rendering hud-related elements when rendering for impostor. http://code.google.com/p/singularity-viewer/issues/detail?id=20&can=1
2011-04-30 16:01:02 -05:00
Shyotl
89c6f11072
Demoted llerrs to llwarns in HippoGridManager::saveFile() to prevent forcing the client to crash on connect if something goes wrong there(Have had a few reports of this llerrs popping up for people on XP). Failure to save is non-critical.
2011-04-30 16:00:06 -05:00
Shyotl
41dc9f9751
Skip rendering hud-related elements when rendering for impostor. http://code.google.com/p/singularity-viewer/issues/detail?id=20&can=1
2011-04-30 15:59:16 -05:00
Siana Gearz
ee2508274e
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/settings.xml
2011-04-30 22:02:02 +02:00
Siana Gearz
4bb68e5a34
Updated root certificates
2011-04-30 22:00:12 +02:00
Shyotl
e3b328a115
Removed superfluous llinfos messages.
2011-04-30 02:13:35 -05:00
Shyotl
0dd3e189fc
Adjusted camera positions while editing physics. Focuses and zooms in closer to location being edited.
2011-04-29 20:15:37 -05:00
Shyotl
a694742522
Added physics subpanel to avatar customize floater.
...
Also, removed redundant tattoo and alpha entries.
Modified LLScrollingPanelParam to work without needing 'hints'. A bit hacky since I didn't want to dive into making yet another xml, but works well enough.
Avatar_lad entries names changed to more readable forms since LLTrans isn't where it needs to be yet.
Camera doesn't move to great positions when editing phys parts, but that's for another day.
2011-04-29 03:39:05 -05:00
Shyotl
d2f66f9bd0
LLTextureCache is spamming warnings as it attempts to remove non-existant files. Not sure if this is a bug or not, but it's been this way for a while now, so I'm squelching it.
2011-04-29 00:24:07 -05:00
Shyotl
8b12d794c5
Added physics saved settings.
...
Emerald physics demoted to legacy. Only enabled on av's that fail to send physics paramaters, or AvatarPhysics is completely disabled.
Params reset when AvatarPhysics is toggled off. (Bugfix for LL's code)
2011-04-28 22:47:48 -05:00
Shyotl
2dff12433c
Avatar Physics innital commit. No edit panel. SavedSettings not plugged in yet.
2011-04-28 10:09:11 -05:00
Shyotl
332cfdb532
Updated llinventory to something closer to V2's implementation. Mostly just restructuring.
...
Most the changes are due to InventoryObjectList* changing to LLInventoryObject::object_list_t*, LLInventoryItem::II_FLAGS* changing to LLInventoryItemFlags::II_FLAGS* and also const'ing.
Certain perms for certain asset types(callcard&landmarks) have been laxed, as per LL's V2.
LLInventoryType now does lookups mostly though new lldictionary class.
LLLandmark using boost for callbacks, instead of custom class structure.
2011-04-28 01:43:44 -05:00
Shyotl
722a1dda04
Minor iterator loop change. http://hg.secondlife.com/viewer-development/changeset/89a345e2d1cf
...
Also a little v2 cleanup snuck in.
2011-04-28 01:20:42 -05:00
Shyotl
0909a4ddbe
Support for new 'rental' parcel category.
2011-04-28 01:18:08 -05:00
Siana Gearz
9a8a28ee1a
HTTP fetch bandwidth limited again
2011-04-28 01:51:09 +02:00
Shyotl
ab35a07f0e
Added anti-spam features.
...
ScriptsCanShowUI:false disables LLMapDestination (from V2)
SH_SpamHandler, derived from Cryogenic's spam blocking:
If flooded by an object, all objects of same owner get blocked.
If flooded by an avatar, avatar will be blocked.
Dialog flood prevention. (Objects only)
Calling card flood prevention (Avatar only)
Chat flood prevention. (Avatar and objects)
IM/Inventory offer flood prevention (Avatar and objects)
See additions to settings_sh.xml for details on new settings pertaining to anti-spam.
2011-04-27 16:39:20 -05:00
Siana Gearz
51133c3894
Dict unbotch
2011-04-27 00:32:12 +02:00
Siana Gearz
0f0d506928
Merge git://github.com/TighMacFanatic/SingularityViewer
2011-04-26 23:45:21 +02:00
tmac@latestevidence.com
8cf8814f8b
Spell check fix
2011-04-26 17:25:57 -04:00
Shyotl
06f14eae42
Merge branch 'V2TextureSystem'
2011-04-25 20:13:42 -05:00
Shyotl
4f264f0359
Testing potential fix for http://code.google.com/p/singularity-viewer/issues/detail?id=5
2011-04-25 19:59:50 -05:00
Shyotl
80db7f58c7
Added pass_post_bump for fullbright bump faces.
2011-04-25 18:18:36 -05:00
Siana Gearz
04b3dee767
Merge remote-tracking branch 'shyotl/V2TextureSystem'
2011-04-26 00:28:58 +02:00
Siana Gearz
b6c0436c1b
Merge branch 'master' of github.com:siana/SingularityViewer
2011-04-26 00:23:01 +02:00
Shyotl
5954e0d71c
Merge branch 'master' into V2TextureSystem
...
Conflicts:
indra/newview/llfloaterexport.cpp
2011-04-24 03:31:31 -05:00
Shyotl
50540049c1
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-04-24 01:05:31 -05:00
Shyotl
2d882e527f
Updating commit from v2renderer to work with new llviewertexture.
2011-04-23 21:09:33 -05:00
Shyotl
ac12349a8a
Merge branch 'V2Renderer' into V2TextureSystem
...
Conflicts:
indra/newview/llviewercontrol.cpp
2011-04-23 19:33:20 -05:00
Shyotl
f7a5394904
Super-sampling only to be done when taking a snapshot to disk in high-res mode. Clamping to 3x.
...
Removed 'SHHighResSnapshotForceTile' setting, as tiling is now the only way snapshots can be done.
2011-04-23 17:51:29 -05:00
tmac@latestevidence.com
af203533b3
Spell check added
2011-04-23 18:08:59 -04:00
Shyotl
41f42fc741
Nuking some glsl warnings, and fixing relwithdebug compile(and prolly gcc too)
2011-04-23 03:02:56 -05:00
Shyotl
c694d12c93
Bringing in-line with V2. mbstowcs->MultiByteToWideChar, ancient comment removal, fullscreen behavior check...
2011-04-23 01:01:55 -05:00
Shyotl
f190644464
LLDrawPoolWater::shade no longer binds diffuse texture if nonexistant or unused by shader. (was firing a warning upon bind)
2011-04-23 00:59:20 -05:00
Shyotl
0b1b7c6618
Fixed issues with changing AA and AF...
...
-AF change no longer reloads the window to apply. Doing such isn't needed anymore.
-AA change no longer reloads the window to apply, IFF RenderUseFBO is true.
-AA change, IFF RenderUseFBO is false, reloads window. Texture issues under this scenario should be resolved.
-LLComboBox now updates control_name it's linked to, automatically.
-New LLComboBox Behavor when paired with new AA/AF application changes renders LLFloaterHardwareSettings::apply() pointless, EXCEPT for when changing AA while FBOs are off.
2011-04-23 00:58:27 -05:00
Shyotl
98c2b7e11f
Sorted out high-res snapshot issues.
...
LL has since removed high-res snapshots using render targets. I find this change to be favorable, as rendertargets were very finicky to get working with anti-aliasing. Also, deferred rendering uses many rendertargets that depend on screen resolution. Changing resolution every screenshot is.. not very awesome.
There is some deviation from LL's viewer. I've kept the old tiled glow pass enabled for non-deferred, as it fixes issues with tile edges truncating glow propogation. However, this does no work with deferred yet. I need to pin down why. I assume using binding one of the RenderTargets is required for deferred.
Additionally, the usage of a RenderTarget for snapshots is what prevented me from fully enabling my supersampling settings. Now that that hurdle is gone, I consider including this new setting by default to be safe enough.
And a note: Do not remove the 'tiling' variable when merging with v2 changes, as singu's glow pass is 'special'. There are other fixes absent from LL's viewer that require knowing if the render is tiled or not. (water reflections/cloud freezing)
2011-04-21 23:36:41 -05:00
narv
a0441619dd
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-21 07:51:40 -07:00
Shyotl
7b1736ea9d
Merge branch 'master' into V2TextureSystem
2011-04-21 00:17:57 -05:00
Shyotl
673a338bf5
Merge branch 'master' into V2Renderer
2011-04-21 00:17:36 -05:00
Shyotl
d3c91698bf
Removed crash vulnerability to malevolently malformed notecards.
2011-04-21 00:17:10 -05:00
Shyotl
ab20e881ce
Local-lights now display in deferred
...
Fixed LLCachedControl<U32> caching invalid values
2011-04-20 20:08:42 -05:00
Siana Gearz
41fe5f47e1
Merge git://github.com/TighMacFanatic/SingularityViewer
2011-04-19 14:20:04 +02:00
Siana Gearz
73cf43cbc9
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2011-04-19 14:00:04 +02:00
Siana Gearz
26058999b3
TOS compliance
2011-04-19 13:59:11 +02:00
Siana Gearz
8f09dedb1e
Wearable import/export, from Imprudence
2011-04-19 13:46:09 +02:00
Siana Gearz
955ca21298
OpenSim compatible prim backup
2011-04-19 01:33:09 +02:00
Siana Gearz
25b4452a12
Sometimes i build offline too
2011-04-18 23:39:47 +02:00
Siana Gearz
5d5231fe8c
Removed Import/Export
2011-04-18 23:28:27 +02:00
Shyotl
d2291b5903
Clamping prim settext max visible range to that of a 15^3 prim, because certain 'people' abuse megaprims to make annoying hovertext spam.
2011-04-18 01:44:40 -05:00
Shyotl
4c068a4a85
Clamping prim settext max visible range to that of a 15^3 prim, because certain 'people' abuse megaprims to make annoying hovertext spam.
2011-04-18 01:44:13 -05:00
Shyotl
eded2546fc
Merge branch 'master' into V2TextureSystem
2011-04-17 20:42:59 -05:00
Shyotl
0c2ea7cc9b
Static'd some llcachedcontrols.
2011-04-17 20:39:54 -05:00
tmac@latestevidence.com
0b9a44a842
Added include so that #ifdefs on compiler/OS actually work.
2011-04-17 14:37:08 -04:00
tmac@latestevidence.com
e81f2ea3be
Made Debug textures floater smaller and better organized.
2011-04-17 14:35:31 -04:00
Shyotl
cacf87e962
The collisions list is a vanilla C array of explicit size? Ugggh.
2011-04-16 23:44:32 -05:00
Shyotl
c816d25e68
The collisions list is a vanilla C array of explicit size? Ugggh.
2011-04-16 23:42:14 -05:00
narv
f318880898
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-16 21:18:37 -07:00
Shyotl
2afa251b64
Added walking sound to collision list in sound explorer floater.
...
Undid some minor regression.
2011-04-16 21:11:34 -05:00
Shyotl
a6c802bd86
Added walking sound to collision list in sound explorer floater.
...
Undid some minor regression.
2011-04-16 21:11:14 -05:00
Shyotl
d32f820903
Merge branch 'master' into V2TextureSystem
2011-04-16 18:25:11 -05:00
Shyotl
c38a47ea48
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-04-16 18:24:34 -05:00
Shyotl
ad19c0209b
Merge branch 'master' into V2TextureSystem
2011-04-16 18:23:41 -05:00
Shyotl
3901893a3a
Resolved some unitialized variables.
2011-04-16 18:21:54 -05:00
Shyotl
d2d53fec7f
Minor tweaks of little consequence. Nullcheck, overrun paranoia.
2011-04-16 18:21:38 -05:00
Shyotl
8204ec5565
New gpu_table entries
2011-04-16 18:20:35 -05:00
Shyotl
48538fe182
Resolved some unitialized variables.
2011-04-16 18:18:24 -05:00
tmac@latestevidence.com
2abece1819
Fixed searching for Visual Studio Express versions
2011-04-16 15:56:15 -04:00
Siana Gearz
8018a8842f
Merge remote branch 'shyotlsv/master'
2011-04-16 16:31:33 +02:00
Siana Gearz
68a95b5b1a
Crashfix/sanity on Octopus
2011-04-16 02:09:49 +02:00
Siana Gearz
ef43a87ac0
Anti suicide kind of thing
2011-04-16 02:07:24 +02:00
Siana Gearz
0c2765511e
Unhack some Inertia octree hack.
...
No performance change.
2011-04-15 18:33:19 +02:00
Siana Gearz
1a0387f918
Idle timeout goes down to 0
2011-04-15 17:12:51 +02:00
Siana Gearz
b9203e487a
Don't need RLV assertions
2011-04-15 17:06:44 +02:00
Siana Gearz
4f9b8443e2
Should correct not being able to accept Vivox license
2011-04-15 17:04:32 +02:00
Shyotl
dbd26ddee1
Minor tweaks of little consequence. Nullcheck, overrun paranoia.
2011-04-15 02:42:30 -05:00
Shyotl
4d2dde73d7
New gpu_table entries
2011-04-15 01:21:33 -05:00
Shyotl
6cbbe493dd
Removed warning regarding 'RenderCubeMap' feature upon startup
2011-04-13 02:48:40 -05:00
Shyotl
8ff0a29f9d
Removed warning regarding 'RenderCubeMap' feature upon startup
2011-04-13 02:47:49 -05:00
Shyotl
f30dc32503
Media textures (browser and such) should now display
2011-04-13 02:44:04 -05:00
Shyotl
a35a59d56b
Revert regression from merge
2011-04-13 01:28:56 -05:00
Shyotl
4d4c49cd24
Merge branch 'master' into V2TextureSystem
...
Conflicts:
indra/newview/llviewerimage.cpp
indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Shyotl
aa1167e4d5
Un-borked Non-Deferred + Snapshot + RenderUseFBO + RenderGlow combination.
2011-04-12 17:47:45 -05:00
Shyotl
9e4bc6754a
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
2011-04-12 16:43:50 -05:00
Shyotl
c6fa0be39b
Cleanup and render-to-texture tweaks.
...
Added two new debug render modes
Fixed bizarre issue with line-widths being sporadically inconsistent in ui. (needs glFlush for some reason)
2011-04-12 16:40:23 -05:00
Shyotl
15a8a86b15
Alphas can now glow as expected
2011-04-12 15:26:03 -05:00
Shyotl
125a90e46b
Cleanup
2011-04-12 15:24:31 -05:00
Shyotl
e9147cb7fb
Cleaned up overlapping elements in group properties panel
2011-04-11 22:19:49 -05:00
Shyotl
db5ba95f58
Fixed fast-alpha'd textures on hud attachments not rendering as fullbright
2011-04-09 19:44:27 -05:00
narv
6666972bf4
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-09 14:36:07 -07:00
Siana Gearz
ab8656d5d8
Version 1.5.6(1)
2011-04-09 22:57:39 +02:00
Siana Gearz
711a4fdacd
Revert "OpenJPEG 1.4 stable"
...
This reverts commit 3fca56df23 .
2011-04-09 20:29:12 +02:00
Siana Gearz
156bb5415d
Revert "Our old crashfixes for OpenJPEG"
...
This reverts commit 753c0b9285 .
2011-04-09 20:28:34 +02:00
narv
0e7dd54081
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-09 07:52:04 -07:00
Shyotl
88fe5d6979
Eups. Compiles now. Hurr.
2011-04-09 01:30:48 -05:00
Shyotl
4e3501d034
Fixed ugly checkboxes. Dem pixels.
2011-04-09 00:30:42 -05:00
Shyotl
b390d74b9c
Name tag should now update consistently upon change via namefromchat bridge
2011-04-09 00:30:15 -05:00
Siana Gearz
fcc98ffe46
Singularity 1.5.6 release
2011-04-08 23:52:52 +02:00
Siana Gearz
fd8866c411
Sione's Media Filter
2011-04-08 19:53:41 +02:00
Siana Gearz
0d3c91269b
Various fixes, mostly through Henri
2011-04-08 17:51:45 +02:00
Siana Gearz
b952d3f4e6
Graphics default adjustments
2011-04-08 15:35:37 +02:00
Siana Gearz
186bd80ba0
Group creation fee fix
2011-04-08 14:07:45 +02:00
Siana Gearz
e6b5811e7e
Hide friend groups until we implement them.
2011-04-08 04:17:37 +02:00
Siana Gearz
344cafcb1b
Don't clutter up the minimap with skyboxes
2011-04-08 03:52:46 +02:00
Shyotl
3a3805fd18
Texture console now shows number of 'cached' raw images.
...
png loading now immediately dumps allocated data on failure
2011-04-07 03:16:11 -05:00
Siana Gearz
58102daf94
Minor adjustments
2011-04-07 02:17:03 +02:00
narv
a717d959aa
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-06 01:06:42 -07:00
Siana Gearz
753c0b9285
Our old crashfixes for OpenJPEG
2011-04-06 04:54:04 +02:00
Siana Gearz
ad4d974812
Stop j2c decode throbbing
2011-04-06 04:25:05 +02:00
Siana Gearz
3fca56df23
OpenJPEG 1.4 stable
2011-04-06 04:23:16 +02:00
Siana Gearz
b7cc1932f1
VWR-24321: fix validation of textures that start with 00, patch by Aleric Inglewood
2011-04-05 00:23:53 +02:00
narv
ff78e24ee3
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-04 10:23:26 -07:00
Siana Gearz
c17b67399b
Final OpenSim group chat fix... i HOPE
2011-04-04 02:48:05 +02:00
narv
284a9c4366
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-03 10:07:21 -07:00
Siana Gearz
cd7b1e434d
Announce incoming option fix
2011-04-03 01:51:07 +02:00
Siana Gearz
f9e0b122ae
Revert voice control to snowglobe
2011-04-03 01:11:48 +02:00
Siana Gearz
7e895d4590
I really got annoyed by [RECIPIENT]
2011-04-03 00:46:34 +02:00
Siana Gearz
6dd9212d16
Group voice chat fix
2011-04-02 05:03:36 +02:00
Siana Gearz
0f038bbffc
Grid manager stuff, part. debrand
2011-04-02 05:03:10 +02:00
Shyotl
6e437d4188
Fixed texture console showing invalid values...
...
Improved texture console progress bar visibility.
Shoehorned sgblacklist for server response status 499
Restored stat recording for LLViewerTextureList
Cleaned up lltexturefetch by excluding more unused code via #if
2011-04-01 17:19:23 -05:00
Siana Gearz
b92dec7530
How about i read before i commit? Fixes PerAccount dir
2011-04-01 20:50:44 +02:00
Siana Gearz
8b54d6503a
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2011-04-01 15:48:35 +02:00
narv
2abb801f3e
Merge branch 'master' of git://github.com/siana/SingularityViewer
2011-04-01 00:56:48 -07:00
Shyotl
05102e98ab
Using newer method to mark faces dirty on alpha change.
2011-04-01 01:16:01 -05:00
Shyotl
497e63bfb6
Fixed scaling issues with non-power-of-two ui textures
2011-03-31 21:53:23 -05:00
Shyotl
e756140e1d
Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
...
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Siana Gearz
1b3e0e6478
Merge remote branch 'shyotlsv/master'
2011-03-28 15:11:03 +02:00