Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 2 | -27/+38 | |
|\ | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||||
| * | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 2 | -18/+29 | |
| | | | | | | | | sticking around | |||||
* | | 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 | 19 | -586/+739 | |
| | | | | | | | | 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 | |||||
* | 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 | 3 | -10/+20 | |
|\ | ||||||
| * | Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for ↵ | Marck | 2010-08-24 | 1 | -8/+17 | |
| | | | | | | | | | | | | | | | | attachments. This fixes Mantis #3923. Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | Plumb the region type through to the ProductName field in estate messages | Melanie | 2010-08-24 | 2 | -2/+3 | |
| | | ||||||
* | | refactor: make RezObject() more readable | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -69/+68 | |
| | | ||||||
* | | add test to check move of task item to user inventory when a target folder ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -0/+26 | |
| | | | | | | | | is explicitly given | |||||
* | | minor: stop test using obsolete property | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -1/+1 | |
| | | ||||||
* | | refactor TestMoveTaskInventoryItemNoParent() | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -24/+37 | |
| | | ||||||
* | | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 4 | -4/+126 | |
|/ | | | | | | goes to the correct directory Also removes some mono compiler warnings | |||||
* | Add system lookup folder fix to the RemoveXInventoryServiceConnector as well ↵ | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -0/+17 | |
| | | | | since this presumably suffers from the same problem. | |||||
* | minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+5 | |
| | ||||||
* | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 3 | -13/+20 | |
| | | | | | This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02 | |||||
* | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 10 | -28/+33 | |
| | ||||||
* | Don't allow oversized search reply packets | Melanie Thielker | 2010-08-21 | 1 | -17/+42 | |
| | ||||||
* | Forward-port a small improvement to the land out connector | Melanie Thielker | 2010-08-21 | 1 | -1/+2 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-20 | 3 | -9/+14 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 2 | -18/+52 | |
| |\ | ||||||
| * | | Unit test breakage fix. | Diva Canto | 2010-08-20 | 3 | -9/+14 | |
| | | | ||||||
* | | | Some code cleanup for console command "create region". | Marck | 2010-08-20 | 1 | -30/+35 | |
| |/ |/| | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text. | |||||
* | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-20 | 1 | -9/+9 | |
| | | ||||||
* | | Some code cleanup for console command alert. | Marck | 2010-08-20 | 1 | -9/+43 | |
|/ | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts. | |||||
* | Cleaned up a few more things related to incoming agents. | Diva Canto | 2010-08-20 | 1 | -45/+42 | |
| | ||||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-20 | 1 | -25/+27 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-19 | 1 | -1/+6 | |
| |\ | ||||||
| * | | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 1 | -25/+27 | |
| | | | | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | |||||
* | | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 2 | -17/+54 | |
| |/ |/| | | | | | to make it more configurable. | |||||
* | | Short-circuit the grid server lookup for RequestSimulatorData if the region | Melanie Thielker | 2010-08-19 | 1 | -1/+6 | |
|/ | | | | info is requested for is the local region | |||||
* | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 | |
| | ||||||
* | Prevent a bad cast in llCreateLink(). | Melanie Thielker | 2010-08-18 | 1 | -1/+5 | |
| | ||||||
* | * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵ | John Hurliman | 2010-08-17 | 3 | -3/+3 | |
| | | | | to fix the build | |||||
* | Attempt at sending TeleportProgress, but it doesn't seem to be doing ↵ | Diva Canto | 2010-08-16 | 1 | -0/+3 | |
| | | | | anything at all. Left it commented, just as a reminder for where those messages could be sent. | |||||
* | Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ↵ | Diva Canto | 2010-08-16 | 3 | -0/+12 | |
| | | | | affected. | |||||
* | Work on TeleportStart: renamed method from TeleportLocationStart to ↵ | Diva Canto | 2010-08-16 | 8 | -19/+22 | |
| | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). | |||||
* | Better comment (related to previous commit) | Diva Canto | 2010-08-15 | 1 | -1/+1 | |
| | ||||||
* | Addresses mantis #4929. Agent was being logged off the grid too soon -- ↵ | Diva Canto | 2010-08-15 | 2 | -6/+23 | |
| | | | | things may still fail. | |||||
* | In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from ↵ | Justin Clark-Casey (justincc) | 2010-08-14 | 1 | -6/+4 | |
| | | | | | | | | libomv rather than little endian then swapping This avoids a problem with failing to swap on big-endian machines. This addresses http://opensimulator.org/mantis/view.php?id=4849 Thanks to Valy- for pointing this out and submitting a suggestion patch | |||||
* | Configuration files can read include files from relative paths. | Marck | 2010-08-13 | 1 | -1/+11 | |
| | ||||||
* | Updated the create_region command in the RemoteAdmin plugin to properly ↵ | randomhuman | 2010-08-13 | 4 | -41/+67 | |
| | | | | support estates without seeking further input on the console. | |||||
* | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-13 | 10 | -63/+62 | |
| | ||||||
* | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -3/+2 | |
| | ||||||
* | refactor: move binary statistics logging from scene into separate region module | Justin Clark-Casey (justincc) | 2010-08-13 | 3 | -110/+181 | |
| | ||||||
* | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 6 | -173/+222 | |
| | ||||||
* | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -3/+3 | |
| |