Commit Graph

7397 Commits

Author SHA1 Message Date
Melanie
c5cfae7bac Revert "After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG"
This reverts commit 241ed5734e.
2010-06-02 17:39:58 +01:00
Melanie
241ed5734e After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG
testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING!
2010-06-02 17:14:37 +01:00
Melanie
f5ca701273 Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
needed libraries
2010-06-01 14:19:26 +01:00
Melanie Thielker
992efdc283 Fix a nullref in EventManager caused by RegionReady not setting the scene 2010-05-30 23:57:33 +01:00
Justin Clark-Casey (justincc)
c7d812802f Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:52:30 +01:00
Justin Clark-Casey (justincc)
5074d290e4 commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries
lots of messy debug code here too which would need to be removed
2010-05-27 21:35:17 +01:00
Justin Clark-Casey (justincc)
a6c7995b71 backport from master fix for attachment display
this fix stops two full updates being sent on attachment rather than one.  Sending two can stop the client displaying attachments properly
2010-05-24 19:19:44 +01:00
Justin Clark-Casey (justincc)
8048a8a39d backport some IGroupsModule method doc and an extra exposed method from git master 2010-05-24 17:33:58 +01:00
Justin Clark-Casey (justincc)
2603f9a134 stop "load oar" reporting ignored objects when those objects were actually loaded just fine
this fix also means that loaded scripts are properly/more promptly started
here, the fix is only done in the oar module.  In master, the underlying problem was fixed instead but this is more invasive.
2010-05-24 16:53:43 +01:00
Justin Clark-Casey (justincc)
e589a31bc4 Only send dialogs and notices to root agents, not child agents
Small change for backport

Conflicts:

	OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
2010-05-21 22:23:13 +01:00
Melanie
59546a348a Change the way the object perms are propagated to attempt to salvage
some older content
2010-05-21 15:57:16 +01:00
Justin Clark-Casey (justincc)
427ae1087f minor: correctly print out missing item id when it can't be found rather than a NullReferenceException 2010-05-20 23:44:49 +01:00
John Hurliman
1c63f6cd85 Don't append ACKs to zerocoded packets. Although this should fine in theory, I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic 2010-05-20 23:38:38 +01:00
Justin Clark-Casey (justincc)
d446b19e72 minor: commented out code removal 2010-05-20 23:34:44 +01:00
Justin Clark-Casey (justincc)
e9bac02fec Completely prevent full update packets being sent after kill object packets
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
Backport from master
2010-05-20 23:32:23 +01:00
Justin Clark-Casey (justincc)
8b5d012200 Completely prevent full update packets being sent after kill object packets
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
2010-05-20 23:32:11 +01:00
Justin Clark-Casey (justincc)
fa8def5e70 minor: Print out port that http servers are using
do this in callers so that we know who is setting up these things
2010-05-20 23:17:56 +01:00
Justin Clark-Casey (justincc)
76238715e3 move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
backport from master
2010-05-20 22:43:05 +01:00
Justin Clark-Casey (justincc)
dd1b99cd0d Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch 2010-05-15 01:07:34 +01:00
Justin Clark-Casey (justincc)
3a8128d309 Merge branch '0.6.9-post-fixes' of ssh://justincc@opensimulator.org/var/git/opensim into 0.6.9-post-fixes 2010-05-14 23:44:09 +01:00
unknown
2c8d25a110 * Allows both old and new OpenSim.ini params for the XmlRpc Groups Service Connector
* Fix problem with RequestingAgentID not being sent correctly to server resulting in failed xmlrpc calls

* Improved debug output
2010-05-14 23:40:40 +01:00
Justin Clark-Casey
9209657f93 Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:22:53 +01:00
unknown
91cfce3758 back port groups changes
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
unknown
8a69070b51 back port groups changes 2010-05-05 16:09:53 +01:00
Melanie
6fdd5bfe2d Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
The patch was for 0.7

This reverts commit 608bb0dfef.
2010-05-05 16:03:20 +01:00
Melanie
608bb0dfef Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
Mantis #4646

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 14:37:05 +01:00
Melanie Thielker
0a9c98e7c4 Fix linking issue introduced in my earlier commit 2010-04-30 20:18:08 +01:00
Melanie
10750421a3 Fix some symbol errors 2010-04-30 12:07:47 +01:00
Melanie
04845c1898 Fix link security issue 2010-04-30 11:48:09 +01:00
John Hurliman
54cedfe432 Changed the GetTextureModule backport to work with the 0.6.9 codebase 2010-04-08 15:57:57 -07:00
John Hurliman
0f3314c04c Backported GetTextureModule and IAssetService.GetCached() 2010-04-08 15:00:01 -07:00
Justin Clark-Casey (justincc)
5caae0293a Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.

Backport from head.
2010-03-09 18:53:04 +00:00
Melanie
3d053b194a Small consistency change 2010-03-07 16:06:52 +00:00
unknown
83929c69e3 - implementing server 1.38 functions
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
Melanie
84b0a23e19 Remove a superfluous array creation 2010-03-04 10:45:46 +00:00
Justin Clark-Casey (justincc)
93967d4a1c fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00
Jeff Ames
300f4c58a6 Separate PhysX classes into separate files. 2010-02-22 13:16:40 +09:00
Jeff Ames
2dea162073 Formatting cleanup. 2010-02-22 12:25:59 +09:00
Jeff Ames
d1f2fae348 Formatting cleanup. 2010-02-20 11:02:06 +09:00
Justin Clark-Casey (justincc)
68b494b2cc Apply http://opensimulator.org/mantis/view.php?id=4495
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
2010-02-19 22:44:33 +00:00
Justin Clark-Casey (justincc)
8294fbd069 minor: remove mono compiler warning 2010-02-19 22:31:53 +00:00
Justin Clark-Casey (justincc)
c767a7901c forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is 2010-02-19 22:30:46 +00:00
Justin Clark-Casey (justincc)
214b1351fb minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/config-include/FlotsamCache.ini.example 2010-02-19 21:18:03 +00:00
Melanie
842b68eeff Change handling of the SYSTEMIP constant to be more sane.
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
Justin Clark-Casey (justincc)
10f94a3c33 remove old commented out switch statement in LLClientView since this has successfully been split into separate methods for quite some time now 2010-02-17 21:13:31 +00:00
Justin Clark-Casey (justincc)
95a31c9b6f minor: fix error inserting field in log message 2010-02-17 20:57:29 +00:00
Justin Clark-Casey (justincc)
4c90ee2943 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-02-16 19:08:06 +00:00
Justin Clark-Casey (justincc)
052f2b3e27 minor: Make SOG.DelinkFromGroup() return the newly delinked scene object instead of void 2010-02-16 14:36:08 +00:00
Jeff Ames
af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
Revolution
5c7acd0d4d Fixes a bug in the previous patch.
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-15 01:07:02 +00:00