| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 4 | -4/+4 |
| | | | | | script state enum to reflect recent changes. | ||||
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 39 | -735/+982 |
| |\ | |||||
| | * | Fix a casting operation to use ToString() | Melanie | 2010-08-30 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-30 | 0 | -0/+0 |
| | |\ | |||||
| | | * | local commit with parcel media bits | Jonathan Freedman | 2010-08-30 | 13 | -205/+311 |
| | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | Implements parcel media setting persistence and packet / CAPS handling | Jonathan Freedman | 2010-08-30 | 13 | -205/+311 |
| | |/ | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | Replace hardcoded 0 with KickFlags provided by the client. | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -0/+9 |
| | |\ | |||||
| | | * | Addresses mantis #4991 -- HG between two regions with the same map ↵ | Diva Canto | 2010-08-27 | 1 | -0/+9 |
| | | | | | | | | | | | | | coordinates fails with no warning | ||||
| | * | | very minor log message and var name tweaking for iar saving | Justin Clark-Casey (justincc) | 2010-08-28 | 2 | -5/+8 |
| | |/ | |||||
| | * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 9 | -371/+384 |
| | | | |||||
| | * | minor: reduce log chattiness of "load iar" for IARs with lots of folders | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -1/+1 |
| | | | |||||
| | * | allow inventory path specified in "load iar" to start with a / (e.g. ↵ | Justin Clark-Casey (justincc) | 2010-08-27 | 3 | -13/+45 |
| | | | | | | | | | /Objects is now valid where it wasn't before) | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-27 | 3 | -15/+41 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-26 | 1 | -1/+4 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-26 | 15 | -131/+193 |
| | | | |\ | |||||
| | | | * | | Send a null result search packet when no results are passsed in | Melanie | 2010-08-26 | 1 | -1/+4 |
| | | | | | | |||||
| | | * | | | Deleted Check4096 from Robust.ini.example | Diva Canto | 2010-08-26 | 1 | -2/+1 |
| | | | |/ | | |/| | |||||
| | | * | | More on mantis #4985 | Diva Canto | 2010-08-26 | 1 | -6/+14 |
| | | | | | |||||
| | | * | | Addresses mantis #4985 -- exceptions in DataSnapshot | Diva Canto | 2010-08-26 | 1 | -7/+23 |
| | | | | | |||||
| | * | | | refactor: Make IAR tests set up standard iar for loading | Justin Clark-Casey (justincc) | 2010-08-27 | 2 | -48/+71 |
| | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -3/+12 |
| | |\ \ | |||||
| | | * | | Addresses mantis #4984 -- Datasnapshot exceptions. | Diva Canto | 2010-08-26 | 1 | -3/+12 |
| | | |/ | |||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -3/+4 |
| | | | | |||||
| | * | | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 2 | -49/+58 |
| | | | | | | | | | | | | | since this appears to relate solely to attachments | ||||
| | * | | refactor: break out attachment position change code in ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 3 | -25/+41 |
| | | | | | | | | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions. | ||||
| | * | | minor: change log message from info to debug | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Rename Newtonsoft.Json.dll to properly reflect its actual assembly name | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -0/+0 |
| | | | | |||||
| | * | | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 7 | -36/+7 |
| | | | | |||||
| | * | | Reinstate kill record check that prevents an entity update being sent to a ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -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-26 | 1 | -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. | ||||
| * | | Remove CRLF endings | Melanie | 2010-08-30 | 1 | -1045/+1045 |
| | | | |||||
| * | | Fix a horrible bug in SG, where iteration of scene objects is carried | Melanie Thielker | 2010-08-26 | 1 | -2/+4 |
| | | | | | | | | | | | out in a fashion that causes the delegate to be invoked once per child prim for a given group. | ||||
| * | | Correct whitespace | Melanie Thielker | 2010-08-26 | 1 | -510/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 23 | -607/+1277 |
| |\ \ | |/ | | | | | This was rather conflicted. Please test linking. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 3 | -31/+47 |
| | |\ | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | * | | Remove parts locking from data classes since these are using a copy of the ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 4 | -168/+155 |
| | | | | | | | | | | | | | scene object | ||||
| | * | | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -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-26 | 23 | -741/+906 |
| | | | | | | | | | | | | | conditions in linking and unlinking | ||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -3/+1 |
| | | | | |||||
| | * | | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -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-25 | 3 | -55/+82 |
| | | | | | | | | | | | | | SceneObjectPartInventory | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 15 | -107/+320 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -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 from | Melanie Thielker | 2010-08-25 | 2 | -18/+29 |
| | | | | | | | | | | | | | sticking around | ||||
| | * | | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | |/ | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
| | * | Typo | Diva Canto | 2010-08-24 | 1 | -1/+1 |
| | | | |||||
| | * | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 3 | -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/opensim | Justin Clark-Casey (justincc) | 2010-08-24 | 4 | -11/+22 |
| | |\ | |||||
| | * | | refactor: make RezObject() more readable | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -69/+68 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |