Commit Graph

134 Commits

Author SHA1 Message Date
Inusaito Sayori
04c78a1d8a Merge in Storm-1838 2013-07-31 15:49:34 -04:00
Latif Khalifa
bd88b91b42 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-07-23 14:53:47 +02:00
Lirusaito
8b5a654c5b General cleanup of LLFloaterCustomize 2013-07-22 23:50:03 -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
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
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
Drake Arconis
43a7cbaa85 Rip out the globals :D 2013-06-21 03:23:52 -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
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
Drake Arconis
73b10e6b29 Made compiler detection more reliable and cleanup clang warnings 2013-05-05 17:56:16 -07: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
dff59ab455 Fix Issue 719: Calling Cards can be opened more than just one at a time 2013-03-29 01:18:48 -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
Drake Arconis
bc2d26464f Remove dead code 2013-03-05 09:08:47 -05: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
Shyotl
e622e03d2a Bulk of server-baking impelmentation and a bit of cleanup. 2013-01-13 02:37:12 -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
Shyotl
9596514c79 Dragged over lltexlayer, lldriverparam, lllocaltextureobject, llwearabledata 2013-01-04 20:50:35 -06:00
Shyotl
e08afcb963 Created llappearance project. Migrated llvoavatardefines and llwearabletype. 2012-12-20 00:00:17 -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
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
Lirusaito
b1ccb70277 Added isClipboardPasteableAsCopy() to decide when not to show Paste As Copy 2012-12-11 15:15:41 -05: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
Shyotl
8a7cc9259c Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2012-12-08 17:13:07 -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
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
Shyotl
fe15371047 Update to LLTombstone/LLHandle/LLRootHandle/LLHandleProvider. 2012-11-13 17:55:52 -06: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
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
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
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
Lirusaito
32e2b584b9 Translation Fix 2012-07-19 02:12:51 -04:00
Shyotl
399d93cc36 Compiler fixes and a crashfix. 2012-06-30 20:06:48 -05:00
Shyotl
945c663359 Updated LLInventoryModelBackgroundFetch and LLInventoryModel(code migration) 2012-06-11 06:57:54 -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
ee84500735 Added some cursory direct-delivery support. 2012-04-16 23:33:34 -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
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
406ff6872f Removed some pointless console spewage, and resolved a crash in avatar picks panel. 2012-03-10 20:02:22 -06:00
Shyotl
d54c86e1df UI polish (scrollbar focus, tearoff menus), plus drag and drop fix. 2012-03-04 23:15:53 -06: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
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
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
Siana Gearz
0bdf54e6d9 This fixes Copy+Wear from object 2012-02-24 03:27:24 +01:00
Shyotl
e2e65c39bf Fixed up LLMenuGL and variants a bit. 2012-02-19 17:41:54 -06:00