aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-014-4/+4
|\
| * Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-314-4/+4
| | | | | | | | script state enum to reflect recent changes.
* | refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments ↵Justin Clark-Casey (justincc)2010-08-311-9/+5
| | | | | | | | rather than filter sp.Attachments list directly
* | Add ScenePresence.GetAttachments(uint attachmentPoint)Justin Clark-Casey (justincc)2010-08-311-0/+21
| |
* | reinsert functionality to debug log more levels of incoming and outgoing ↵Justin Clark-Casey (justincc)2010-08-313-11/+50
|/ | | | | | | client protocol packets These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets) This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
* minor: Add some method doc to BaseHttpServer.HandleRequest()Justin Clark-Casey (justincc)2010-08-301-2/+8
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-3013-205/+311
|\
| * Fix a casting operation to use ToString()Melanie2010-08-301-1/+1
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-300-0/+0
| |\
| | * local commit with parcel media bitsJonathan Freedman2010-08-3013-205/+311
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-3013-205/+311
| |/ | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
* | Report exception message as well as stack trace if a region fails to ↵Justin Clark-Casey (justincc)2010-08-301-1/+3
|/ | | | register with the grid service in grid mode
* Replace hardcoded 0 with KickFlags provided by the client.Justin Clark-Casey (justincc)2010-08-281-1/+1
| | | | This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-281-0/+9
|\
| * Addresses mantis #4991 -- HG between two regions with the same map ↵Diva Canto2010-08-271-0/+9
| | | | | | | | coordinates fails with no warning
* | very minor log message and var name tweaking for iar savingJustin Clark-Casey (justincc)2010-08-282-5/+8
|/
* Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-289-371/+384
|
* minor: reduce log chattiness of "load iar" for IARs with lots of foldersJustin Clark-Casey (justincc)2010-08-271-1/+1
|
* allow inventory path specified in "load iar" to start with a / (e.g. ↵Justin Clark-Casey (justincc)2010-08-273-13/+45
| | | | /Objects is now valid where it wasn't before)
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-273-15/+41
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-261-1/+4
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-2615-131/+193
| | |\
| | * | Send a null result search packet when no results are passsed inMelanie2010-08-261-1/+4
| | | |
| * | | Deleted Check4096 from Robust.ini.exampleDiva Canto2010-08-261-2/+1
| | |/ | |/|
| * | More on mantis #4985Diva Canto2010-08-261-6/+14
| | |
| * | Addresses mantis #4985 -- exceptions in DataSnapshotDiva Canto2010-08-261-7/+23
| | |
* | | refactor: Make IAR tests set up standard iar for loadingJustin Clark-Casey (justincc)2010-08-272-48/+71
|/ /
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-261-3/+12
|\ \
| * | Addresses mantis #4984 -- Datasnapshot exceptions.Diva Canto2010-08-261-3/+12
| |/
* | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-261-3/+4
| |
* | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵Justin Clark-Casey (justincc)2010-08-262-49/+58
| | | | | | | | since this appears to relate solely to attachments
* | refactor: break out attachment position change code in ↵Justin Clark-Casey (justincc)2010-08-263-25/+41
| | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions.
* | minor: change log message from info to debugJustin Clark-Casey (justincc)2010-08-261-1/+1
| |
* | Rename Newtonsoft.Json.dll to properly reflect its actual assembly nameJustin Clark-Casey (justincc)2010-08-261-0/+0
| |
* | Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-267-36/+7
| |
* | Reinstate kill record check that prevents an entity update being sent to a ↵Justin Clark-Casey (justincc)2010-08-261-1/+19
| | | | | | | | | | | | | | client after it has been told that the entity has been deleted. On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog. This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
* | Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()Justin Clark-Casey (justincc)2010-08-261-2/+16
|/ | | | By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-263-31/+47
|\ | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief.
| * Make scene object directories more robust and prevent deleted SOP's fromMelanie Thielker2010-08-252-18/+29
| | | | | | | | sticking around
| * Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
| | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless.
* | Remove parts locking from data classes since these are using a copy of the ↵Justin Clark-Casey (justincc)2010-08-264-168/+155
| | | | | | | | scene object
* | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵Justin Clark-Casey (justincc)2010-08-261-1/+1
| | | | | | | | always 0 (and any other number would cause an error anyway)
* | Improve consistency of locking for SOG.m_parts in order to avoid race ↵Justin Clark-Casey (justincc)2010-08-2623-741/+906
| | | | | | | | conditions in linking and unlinking
* | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-251-3/+1
| |
* | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUIDJustin Clark-Casey (justincc)2010-08-251-1/+10
| | | | | | | | Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
* | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵Justin Clark-Casey (justincc)2010-08-253-55/+82
|/ | | | SceneObjectPartInventory
* TypoDiva Canto2010-08-241-1/+1
|
* Split out actual scene object insertion code from Scene.Inventory.RezObject ↵Justin Clark-Casey (justincc)2010-08-243-25/+62
| | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-244-11/+22
|\