aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
|\
| * Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for ↵Marck2010-08-241-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 messagesMelanie2010-08-243-3/+5
| |
* | refactor: make RezObject() more readableJustin Clark-Casey (justincc)2010-08-241-69/+68
| |
* | add test to check move of task item to user inventory when a target folder ↵Justin Clark-Casey (justincc)2010-08-241-0/+26
| | | | | | | | is explicitly given
* | minor: stop test using obsolete propertyJustin Clark-Casey (justincc)2010-08-241-1/+1
| |
* | refactor TestMoveTaskInventoryItemNoParent()Justin Clark-Casey (justincc)2010-08-241-24/+37
| |
* | Add automated test at the opensim 'api' level to check that a given item ↵Justin Clark-Casey (justincc)2010-08-2411-32/+170
|/ | | | | | 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-231-0/+17
| | | | since this presumably suffers from the same problem.
* minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.csJustin Clark-Casey (justincc)2010-08-231-1/+5
|
* Fix bug in llGiveInventory() where items were disappearing on relogJustin Clark-Casey (justincc)2010-08-235-16/+38
| | | | | 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-2317-79/+78
|
* Finally putting estate_settings.xml to rest. There will be no more attemptsMelanie2010-08-211-198/+0
| | | | to read or write this file.
* Don't allow oversized search reply packetsMelanie Thielker2010-08-211-17/+42
|
* Forward-port a small improvement to the land out connectorMelanie Thielker2010-08-211-1/+2
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-206-20/+65
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-202-18/+52
| |\
| * | Unit test breakage fix.Diva Canto2010-08-206-20/+65
| | |
* | | Some code cleanup for console command "create region".Marck2010-08-202-31/+36
| |/ |/| | | | | | | | | 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 warningJustin Clark-Casey (justincc)2010-08-201-9/+9
| |
* | Some code cleanup for console command alert.Marck2010-08-201-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 Canto2010-08-201-45/+42
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-2011-164/+213
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-191-1/+6
| |\
| * | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵Diva Canto2010-08-194-119/+48
| | | | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵Diva Canto2010-08-198-47/+167
| | | | | | | | | | | | untested. Committing to move to my other computer.
* | | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-202-17/+54
| |/ |/| | | | | to make it more configurable.
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-191-40/+28
|\ \ | |/
| * Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."Diva Canto2010-08-191-40/+28
| | | | | | | | | | | | Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way. This reverts commit e47608fc62647a28be91dd9caf6e446826fdb54c.
* | Short-circuit the grid server lookup for RequestSimulatorData if the regionMelanie Thielker2010-08-191-1/+6
|/ | | | info is requested for is the local region
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-1936-4334/+11
|\
| * Improve some logging in LandConnectorJustin Clark-Casey (justincc)2010-08-191-6/+10
| | | | | | | | This also eliminate the last 'OGS1' logging message (in this case, an erroneous one)
| * remove ancient and unused OpenSim.GridLaunch GUI code.Justin Clark-Casey (justincc)2010-08-1934-4327/+0
| | | | | | | | Current policy is that OpenSim core is not the place for gui tools
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-191-28/+40
| |\
| * | minor: Correct string format in "Can't find linkset root prim" messageJustin Clark-Casey (justincc)2010-08-191-1/+1
| | |
* | | Skip conversion if fields that are null in the database. This mayMelanie Thielker2010-08-191-0/+4
| |/ |/| | | | | uncover errors elsewhere.
* | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-181-28/+40
|/ | | | (Files .xml and .txt also want to be committed)
* Prevent a bad cast in llCreateLink().Melanie Thielker2010-08-181-1/+5
|
* * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵John Hurliman2010-08-173-3/+3
| | | | to fix the build
* Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. ↵Diva Canto2010-08-161-2/+13
| | | | Basically, let's not let the xml-rpc library do the DNS conversion...
* Attempt at sending TeleportProgress, but it doesn't seem to be doing ↵Diva Canto2010-08-161-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 Canto2010-08-168-0/+32
| | | | affected.
* Work on TeleportStart: renamed method from TeleportLocationStart to ↵Diva Canto2010-08-1613-24/+27
| | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
* Increased the timeout on AgentUpdate to 30 sec and improved error message to ↵Diva Canto2010-08-161-2/+2
| | | | try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
* Better comment (related to previous commit)Diva Canto2010-08-151-1/+1
|