Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,937 Commits 20 Branches 51 Tags
6bbff07e00efe65205d69d8f7e424cdecce47dde
Commit Graph

99 Commits

Author SHA1 Message Date
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
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
Siana Gearz
6348635d3f Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl) 2011-06-23 21:11:52 +02:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Shyotl
a07e399801 LLAgentCamera transition (1/2) 2011-06-07 21:35:10 -05: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
TighMacFanatic
b7a697bcf9 Merge branch 'PrefsUpdate' 2011-05-29 20:23:59 -04: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
Shyotl
49b893c806 Removed most OGPX related code. 2011-05-28 17:11:10 -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
TighMacFanatic
139a3d35bb Further updates to preferences for bug fixes and user friendliness. 2011-05-26 00:20:45 -04: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
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
fb14aff1f6 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-05-14 14:01:58 -05: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
TighMacFanatic
3fbc4a1dba Added money transactions to local chat 2011-05-12 13:35:08 -04: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