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
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
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
ece9dda7b4
Initial support for the Clang compiler and numerous warning fixes
2012-07-02 19:45:41 +00:00
Lirusaito
20f138b31f
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-30 21:16:27 -04: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
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
Shyotl
ee84500735
Added some cursory direct-delivery support.
2012-04-16 23:33:34 -05:00
Shyotl
e1d243272f
V3 merge part 1 / 2.
2012-04-13 22:39:39 -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
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
Siana Gearz
459751f206
Catching up with Lindies part 1
2012-03-25 09:31:03 +02: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
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
ae7b12f230
Interim commit before diving into reworking the inventory panel.
2012-02-16 19:25:59 -06: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
acf378e9f2
Auto-version system
2012-02-09 14:03:49 +01:00
Siana Gearz
3d40cd86ac
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
2012-02-05 15:14:53 +01:00
Siana Gearz
859e2701f2
Restore LightShare compatibility
2012-02-05 13:52:50 +01:00
Siana Gearz
2526d04397
Cosmetic fix llRegionSayTo
2012-02-02 11:31:46 +01:00
Siana Gearz
071745007a
Partial port of Phoenix Windlight parts
2012-02-01 06:36:10 +01: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
Siana Gearz
7fec659979
Update RLVa to 1.4.0-compatible
2012-01-25 21:11:33 +01: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
6374f012de
new fasttimers, including ui.
2012-01-23 18:30:54 -06:00
Shyotl
4a4b786a60
New inventory observer implementation.
2012-01-21 04:54:39 -06: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
Shyotl
670b85a86f
Migrated code out of drag and drop, and into LLGiveInventory.
2012-01-13 22:41:15 -06:00
Lirusaito
9d3b276f61
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-12 23:39:16 -05:00
Shyotl
1cc33caaa3
Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions
2012-01-12 18:57:10 -06:00
Lirusaito
8543106f5e
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-01-11 02:28:14 -05: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
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
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
626a94cf8f
Merge branch 'master' of git://github.com/siana/SingularityViewer
2012-01-07 15:38:58 -05:00
Siana Gearz
b911e86b02
Merge branch 'future' of git://github.com/Shyotl/SingularityViewer
2012-01-06 10:40:05 +01: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
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
Siana Gearz
acb24dd3e1
Some Resident scrubbing from IM headers, a-la V3
2011-12-24 08:56:20 +01:00
Shyotl
ae0196e2c3
Inconsistent line endings in newview/llviewermessage.cpp
2011-10-14 23:15:28 -05: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
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
36e0f667d5
gAgent.set/getInventoryRootID() changed to gInventory.set/getRootFolderID()
2011-10-12 02:29:12 -05:00
TighMacFanatic
ed8fad3fd9
Merge branch 'future' of https://github.com/siana/SingularityViewer
2011-10-05 20:17:24 -04:00
Shyotl
74dc875a27
Beginning to pull LLVOAvatarSelf out from LLVOAvatar.
2011-10-02 02:51:10 -05:00
TighMacFanatic
00699801d2
Merge branch 'future'
2011-09-24 22:36:40 -04: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