aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Fix a nullref in EventManager caused by RegionReady not setting the sceneMelanie Thielker2010-05-301-0/+1
| | | | | | |
| | * | | | | Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.Justin Clark-Casey (justincc)2010-05-281-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | commit code which stops full updates being fired multiple times when ↵Justin Clark-Casey (justincc)2010-05-2710-23/+123
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | attachments cross standalone region boundaries lots of messy debug code here too which would need to be removed
| | * | | | backport from master fix for attachment displayJustin Clark-Casey (justincc)2010-05-243-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | this fix stops two full updates being sent on attachment rather than one. Sending two can stop the client displaying attachments properly
| | * | | | backport some IGroupsModule method doc and an extra exposed method from git ↵Justin Clark-Casey (justincc)2010-05-241-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | master
| | * | | | stop "load oar" reporting ignored objects when those objects were actually ↵Justin Clark-Casey (justincc)2010-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Apply http://opensimulator.org/mantis/view.php?id=4724Justin Clark-Casey (justincc)2010-05-212-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak to update appearance calls Fix for deleting inventory items from a folder. Thanks StrawberryFride!
| | * | | | Only send dialogs and notices to root agents, not child agentsJustin Clark-Casey (justincc)2010-05-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small change for backport Conflicts: OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
| | * | | | Replace CSJ2K with fixed version (Mantis #3318)Melanie2010-05-211-0/+0
| | | | | |
| | * | | | Change the way the object perms are propagated to attempt to salvageMelanie2010-05-211-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | some older content
| | * | | | minor: correctly print out missing item id when it can't be found rather ↵Justin Clark-Casey (justincc)2010-05-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | than a NullReferenceException
| | * | | | Don't append ACKs to zerocoded packets. Although this should fine in theory, ↵John Hurliman2010-05-201-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | When saving an oar/iar, don't attempt to write out the data byte array if ↵Justin Clark-Casey (justincc)2010-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's empty On Mono 2.6 (and probably before) this causes a non-obvious IOException
| | * | | | minor: commented out code removalJustin Clark-Casey (justincc)2010-05-201-1/+0
| | | | | |
| | * | | | Completely prevent full update packets being sent after kill object packetsJustin Clark-Casey (justincc)2010-05-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Completely prevent full update packets being sent after kill object packetsJustin Clark-Casey (justincc)2010-05-201-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | minor: Print out port that http servers are usingJustin Clark-Casey (justincc)2010-05-205-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things
| | * | | | put out full exception stack if something reaches top of base http server ↵Justin Clark-Casey (justincc)2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
| | * | | | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6Justin Clark-Casey (justincc)2010-05-204-990/+5828
| | | | | | | | | | | | | | | | | | | | | | | | Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
| | * | | | automatically delete %temp% directory after running testsJustin Clark-Casey (justincc)2010-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | this prevents a huge cruft buildup
| | * | | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵Justin Clark-Casey (justincc)2010-05-205-108/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules can use it backport from master
| | * | | | Make "nant distbin" remove BUILDING.txtJustin Clark-Casey2010-05-151-0/+1
| | | | | |
| | * | | | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵Justin Clark-Casey (justincc)2010-05-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | dereference inside the exception catch
| | * | | | remove unrequired [Groups] section from GridCommon.ini.example, as per NebadonJustin Clark-Casey (justincc)2010-05-151-5/+1
| | | | | |
| | * | | | Merge branch '0.6.9-post-fixes' of ↵Justin Clark-Casey (justincc)2010-05-142-1/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | ssh://justincc@opensimulator.org/var/git/opensim into 0.6.9-post-fixes
| | | * | | | change 0.6.9 flavour to post-fixesJustin Clark-Casey (justincc)2010-05-141-1/+1
| | | | | | |
| | | * | | | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671Justin Clark-Casey2010-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia!
| | * | | | | * Allows both old and new OpenSim.ini params for the XmlRpc Groups Service ↵unknown2010-05-142-31/+80
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connector * Fix problem with RequestingAgentID not being sent correctly to server resulting in failed xmlrpc calls * Improved debug output
| * | | | | Fix casting in llParcelMediaCommandList so that it actually, you know, worksTom Grimshaw2010-05-311-16/+16
| | | | | |
* | | | | | Merge branch 'master' into bigmergeMelanie2011-12-0912-282/+357
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Revert "Revert "Stop performing the asset save part of baked texture ↵Justin Clark-Casey (justincc)2011-12-081-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uploading on the UploadBakedTexture cap asynchronously."" This turned out not to be the upload texture issue. This reverts commit 8721841fc3944ce0cdf5ce76297e73f9ed269751.
| * | | | | Don't reply with an ack packet if the client is not authorized.Justin Clark-Casey (justincc)2011-12-082-45/+31
| | | | | |
| * | | | | Extend TestAddClient() to check that the first packet received is an ack packetJustin Clark-Casey (justincc)2011-12-083-93/+116
| | | | | |
| * | | | | Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suiteJustin Clark-Casey (justincc)2011-12-082-4/+2
| | | | | |
| * | | | | Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-085-125/+200
| | | | | | | | | | | | | | | | | | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
| * | | | | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-084-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract
| * | | | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-12-082-3/+1
| | | | | |
* | | | | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-12-081-26/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into bigmerge
| * \ \ \ \ \ Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-080-0/+0
| |\ \ \ \ \ \
| * | | | | | | Remove superfluous try blockMelanie2011-12-081-27/+14
| | | | | | | |
* | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-0813-100/+203
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | When a client connects to a scene, send other avatar appearance data ↵Justin Clark-Casey (justincc)2011-12-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asynchronously to reduce hold up in the IN UDP packet processing loop. This is already being done for the initial object data send.
| * | | | | | On a new client circuit, send the initial reply ack to let the client know ↵Justin Clark-Casey (justincc)2011-12-0813-78/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
| * | | | | | Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway. So instead retain the check/create ScenePresence reference and use this.
* | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-081-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Remove a left over log outputMelanie2011-12-081-2/+1
| | | | | |
* | | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-0819-1742/+1515
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-12-081-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Remove warning in admin_save_oar xmlrpc method where noassets == true was ↵Justin Clark-Casey (justincc)2011-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | comparing against an object rather than a string
| | * | | | | Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ↵Justin Clark-Casey (justincc)2011-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | success = true on success rather than false