aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2011-07-102-24/+65
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorroot2011-07-092-24/+65
| |\
| | * Rename SetSculptData() to SetSculptProperties(), since this is what it does ↵Justin Clark-Casey (justincc)2011-07-091-1/+1
| | | | | | | | | | | | (setting SculptData is done through the property)
| | * minor: code tidy and inserted log lines for future use.Justin Clark-Casey (justincc)2011-07-091-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory When phantom is toggled, the sculptdata is regenerated before remeshing. But on resize, the sculptdata is not regenerated. So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
| | * When loading library asset set, only store an asset if it's different from ↵Justin Clark-Casey (justincc)2011-07-081-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | an existing one with the same id. We compare existing and loaded asset by doing an SHA1 on both, so that a changed library asset will still update the store. This cuts asset library load time from 10 seconds to <1 sec. Note, a fix on the previous commit revealed a bug where a library script cannot be copied except on the first login after a cache clear. This is unrelated to this commit and needs to be fixed at some subsequent time.
| | * Fix interpretation of physics mesh proxies from mesh dataJustin Clark-Casey (justincc)2011-07-081-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some submesh blocks may just have the flag "NoGeometry" to signal that they provide no mesh data. If a block contains this, ignore it for meshing purposes rather than suffer a ClassCastException This fixes physics proxy meshing, so you can now walk through mesh doorways, properly stand on the trailer of mesh trucks, etc. To get mesh physics proxy, the UseMeshiesPhysicsMesh must be true in a [Mesh] config section in OpenSim.ini (example in OpenSimDefaults.ini). Convex hull physics not currently supported.
* | | Dammit, loggin the type of an exception without providing the FULL DUMP is NOTMelanie2011-07-101-0/+1
|/ / | | | | | | going to help squash bugs!
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-053-18/+42
|\ \ | |/
| * Add basic flotsam asset cache test for retrieved cached asset.Justin Clark-Casey (justincc)2011-07-041-0/+1
| | | | | | | | Disabled temporarily since file system caching disrupts subsequent test runs
| * Make default serverside_object_permissions = true since this better matches ↵Justin Clark-Casey (justincc)2011-07-011-11/+0
| | | | | | | | | | | | user expectations. It also matches the default setting in the OpenSim.ini.example file
| * If OpenSim has been built from a git tree, then include version information ↵Justin Clark-Casey (justincc)2011-07-011-4/+39
| | | | | | | | | | | | automatically by dereferencing .git/HEAD A blank bin/.version file will stop this being displayed.
| * refactor: rename gitCommitFileName to manualVersionFileName since ↵Justin Clark-Casey (justincc)2011-07-011-5/+4
| | | | | | | | bin/.version doesn't necessary have to be a git hash
| * Add an async inventory details sender to respond to FetchInventory packets.Justin Clark-Casey (justincc)2011-07-011-1/+1
| | | | | | | | | | | | | | If a user with a very large inventory right-clicks on their "My Inventory" folder, viewer 1 code will send a massive number of Fetchinventory requests. Even though each is handled asynchronously via a pool thread, the sheer frequency of requests overwhelms the pool and freezes inbound packet handling. This change makes the first Fetchinventory thread also handle subsequent requests, freeing up the other threads. Further efficiencies could be made by handling all the items in a particular FetchInventory request together, rather than separately.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-06-207-6/+95
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-2/+2
| |\ \ | | |/
| | * First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-121-2/+2
| | | | | | | | | | | | some issues with the zoom level -- TBD.
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-2/+6
| |\ \ | | |/
| | * Save the sun's position in OARsOren Hurvitz2011-06-101-2/+6
| | |
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-095-2/+87
| |\ \ | | |/
| | * HG Landmarks now working.Diva Canto2011-06-032-1/+4
| | |
| | * Fill in the new OwnerData field in the LLUDP ScriptDialog message.Justin Clark-Casey (justincc)2011-05-311-1/+13
| | | | | | | | | | | | | | | If we don't do this then viewer 2.8 crashes. Resolves http://opensimulator.org/mantis/view.php?id=5510
| | * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-2/+4
| | | | | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-211-1/+0
| | |\
| | * | HG Friends working to some extent: friendships offered and accepted ↵Diva Canto2011-05-193-0/+68
| | | | | | | | | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | | | Add some flags to control content in search betterMelanie2011-06-201-0/+13
|/ / /
* | | Merge branch 'careminster-presence-refactor' of ↵Tom2011-05-262-5/+4
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-221-1/+0
| |\ \ \ | | | |/ | | |/|
| | * | Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just ↵Justin Clark-Casey (justincc)2011-05-211-1/+0
| | |/ | | | | | | | | | OpenSim.Tests.Common instead
| * | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-201-4/+4
| |\ \ | | |/
| | * Changed yet more Warns to Debugs.Diva Canto2011-05-141-4/+4
| | |
* | | Some additional protection, it seems that responsedata needs to be locked, ↵Tom2011-05-261-5/+14
|/ / | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
* | If a response cannot be obtained (the script has no handler) return a more ↵Tom2011-05-171-4/+18
| | | | | | | | friendly 500 error instead of crashing out with a null reference and letting the connection hang
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-142-5/+8
|\ \ | |/
| * Also changed a couple of messages in WebUtil from Wanr/Info to Debug.Diva Canto2011-05-141-2/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-141-2/+2
| |\
| | * refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() ↵Justin Clark-Casey (justincc)2011-05-141-2/+2
| | | | | | | | | | | | instance methods since it didn't make sense to use anything other than the instance themselves.
| * | Stop spamming Nebadon's console when assets aren't found in the asset server.Diva Canto2011-05-141-1/+4
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-131-9/+23
|\ \ | |/
| * Hopefully this fixes offline messages. The problem was: the server is not ↵Diva Canto2011-05-121-7/+2
| | | | | | | | setting the ContentLength of the response. That comes up to OpenSim as ContentLength=-1, which made the existing test fail.
| * One more thing printed out. #OfflineIMDiva Canto2011-05-121-4/+1
| |
| * Instrument the heck out of offline messages. THIS IS VERY VERBOSE.Diva Canto2011-05-121-0/+16
| |
| * One more debug message for offline IMs.Diva Canto2011-05-121-1/+2
| |
| * Sequencing the using and try clauses as they were before, but this shows ↵Diva Canto2011-05-121-7/+7
| | | | | | | | that that obsolete function is not catching 404's as it should...
| * Bummer, can't print the data I wanted to see. Printing just the context.Diva Canto2011-05-121-9/+1
| |
| * Tracking a problem with offline IMs coming in as null list.Diva Canto2011-05-121-6/+19
| |
| * This makes compression of fatpacks actually work. Previously they always ↵Diva Canto2011-05-111-7/+7
| | | | | | | | failed. See comment in WebUtil.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-091-1/+1
|\ \ | |/
| * The map is seriously broken. This doesn't fix it, but at least provides one ↵Diva Canto2011-05-081-1/+1
| | | | | | | | more piece of data that seems to be required -- agent flags, which seem to be different in Viewer 2. WARNING: changes IClientAPI.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-091-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-05-081-0/+5
| |\