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
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
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
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
fd317a4092
newview V3 partial merge.
2011-08-30 01:05:59 -05:00
Shyotl
1f187b09ee
LLCommon cleanup and updating to V2 (V3 now, I guess.)
2011-08-27 01:57:10 -05: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
1c38d016d5
Removed old RLV code. Plugged holes with RLVa.
2011-08-14 02:33:57 -05:00
Siana Gearz
174a33beb3
Variable size region support, by RevolutionSmythe
2011-08-04 22:20:25 +02:00
Siana Gearz
d255bfa6f7
Variable size region support, by RevolutionSmythe
2011-08-03 17:40:06 +02: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
6ad9367c24
Trying out new LLCachedControl implementation.
2011-07-16 23:36:56 -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
7e0ee6bb71
Shiny new name cache.
2011-07-15 00:21:38 -05:00
Siana Gearz
62780b0787
llOwnerSay particles interfere with CCS
2011-07-11 04:14:24 +02:00
Siana Gearz
47b7fdb5e0
LightShare compatible WindLight reset fix, not fully tested
2011-07-11 03:27:59 +02:00
Shyotl
5cdcf0d237
Merge branch 'future' of git://github.com/siana/SingularityViewer.git
2011-06-30 10:27:13 -05:00