aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* refactor: Simplify reading OdeScene.Simulate() loop by shunting all the ↵Justin Clark-Casey (justincc)2011-07-291-182/+191
| | | | | | NINJA joints stuff into its own method. Now if ninja joints isn't active (which is the default) don't have to wade through a lot of massively indented irrelevant code.
* refactor: unindent the OdeScene.Simulate() loop to ignore the long commented ↵Justin Clark-Casey (justincc)2011-07-291-270/+274
| | | | | | out ifs and locks This is to make it more readable.
* When using osTeleportAgent() and osTeleportAvatar(), only teleport if the ↵Justin Clark-Casey (justincc)2011-07-291-4/+8
| | | | | | | | region name exactly matches (not near matches) This is to prevent situations where the first name returned by GridService.GetRegionsByName is not one that exactly matches the given region name, even when there is an exact match later on in the list. Only the above two functions call this teleport method (the map uses a different routine) so this seems safe to change. Addresses http://opensimulator.org/mantis/view.php?id=5606
* Ensure that packet headers get parsed correctlyMelanie2011-07-271-0/+29
|
* Fix LLTextBox to work with the updated libOMVMelanie2011-07-237-7/+14
|
* Pass the first name and last name from the agent circuit data to the ↵Justin Clark-Casey (justincc)2011-07-237-37/+50
| | | | | | | | | | authorization service rather than from the account. This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account. See http://opensimulator.org/mantis/view.php?id=5517, this code is somewhat adapted/cleaned up from Michelle's patch I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure. It's up to the auth service to decide which data it actually uses. Possibly we should be passing through other info such as agent circuit ip
* Change default AllowScriptCrossings config setting to true.Justin Clark-Casey (justincc)2011-07-232-5/+9
| | | | | | When this setting is false and other defaults haven't been changed, scripts entering the simulator from another sim are automatically restarted but their state is not preserved. When this setting is true, state that accompanies the script is reloaded (e.g. if a script had a variable i = 1 when leaving the source region, it will still have i = 1 on the destination region). This setting does not affect crossings when regions are run in the same simulator. In this case, state is already preserved.
* Fixed serverside_object_permission default value conflictionMakopoppo2011-07-232-3/+3
|
* For default everyone permissions on library items, make notecards and ↵Justin Clark-Casey (justincc)2011-07-232-9/+6
| | | | | | | | | | scripts non-modifiable (but still copyable, etc). Users should not be given the impression that they can modify these items. This still does not solve the issue where library items cannot be dragged into prims or user inventory any time after they are initially seen. Curiously, manually copying and pasting still appears to work. On the surface, this seems to have something to do with library item caching on the client, since deleting the cache allows drag to work again once Not sure what the exact problem is.
* Remove manually permissions settings on all current library items so that ↵Justin Clark-Casey (justincc)2011-07-2317-545/+152
| | | | | | | they use the defaults instead. Some items had completely wrong permissions - this is easier than correcting them all. The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
* Revert "Don't load current/next/everyone/base permissions from the library ↵Justin Clark-Casey (justincc)2011-07-2317-159/+567
| | | | | | | | item xml files - always use PermissionMask.All instead (which was the existing default)." There actually are uses for this. I will correct the perms instead since some entries appear to be wrong. This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1.
* Don't load current/next/everyone/base permissions from the library item xml ↵Justin Clark-Casey (justincc)2011-07-2317-567/+159
| | | | | | files - always use PermissionMask.All instead (which was the existing default). Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
* Fix problem where sculpts were not getting physical proxiesJustin Clark-Casey (justincc)2011-07-221-2/+2
| | | | | Fixed this by inspecting Shape.SculptEntry at various places instead of Shape.SculptType. Sculpties actually have a SculptType of Cylinder - only true mesh is SculptType.Mesh This addresses http://opensimulator.org/mantis/view.php?id=5595
* Thank you, Michelle Argus, for a patch that adds reading the agent limitMelanie2011-07-221-1/+4
| | | | from XML properly.
* Generate the initial maptile asynchronouslyOren Hurvitz2011-07-222-15/+17
| | | | Signed-off-by: Melanie <melanie@t-data.com>
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimroot2011-07-215-41/+31
|\
| * remove the windows debugging symbols for the long protobuf-netJustin Clark-Casey (justincc)2011-07-211-0/+0
| |
| * remove dead MXP default symbols. The MXP code is long, long gone.Justin Clark-Casey (justincc)2011-07-211-0/+0
| |
| * make [SMTP] default comment option match actual defaultJustin Clark-Casey (justincc)2011-07-212-10/+10
| |
| * minor: group all the map tile options togetherJustin Clark-Casey (justincc)2011-07-212-15/+16
| |
| * remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-07-211-1/+4
| |
| * minor: remove the pointless quotes from the GenerateMaptiles optionJustin Clark-Casey (justincc)2011-07-211-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-07-213-18/+3
| |\
| | * Removed unused AddPrimShape methods in PhysicsScene caused by merge conflictsDan Lake2011-07-201-14/+0
| | |
| * | make default TextureOnMapTile true for the older map imagerJustin Clark-Casey (justincc)2011-07-212-3/+3
| | | | | | | | | | | | Don't know of a good reason not to do this, seems to work fine.
* | | When an uncached asset is requested multiple times concurrently, only load ↵Oren Hurvitz2011-07-211-9/+49
| | | | | | | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com>
* | | When handling SetAppearance packet, always save the appearance; not only if ↵Oren Hurvitz2011-07-211-5/+5
| | | | | | | | | | | | the texture was changed
* | | Fixed updating avatar appearanceOren Hurvitz2011-07-212-11/+20
| |/ |/| | | | | Signed-off-by: root <root@grid00001.t-data.com>
* | Apply the localID to the Physics actor to prevent null calls laterCareminster Team2011-07-191-3/+3
| |
* | Tidy up a superfluous AddPrimShape override in PhysicsSceneCareminster Team2011-07-191-1/+0
|/
* On all undo/redo operations, consistently lock the undo object for ↵Justin Clark-Casey (justincc)2011-07-191-5/+1
| | | | everything, in order to avoid any deadlock issues.
* If we store an undo, wipe anything already present on the redo stackJustin Clark-Casey (justincc)2011-07-191-0/+3
| | | | | This stops problems when we undo a few steps and start off down another path. Surprisingly, apart from this now fixed problem, redo appears to be working too.
* stop redo throwing an exception if there is nothing to redoJustin Clark-Casey (justincc)2011-07-191-10/+13
|
* refator: simplify UndoState.Compare() codeJustin Clark-Casey (justincc)2011-07-191-20/+9
|
* rip out pointless null checks in UndoState where part can never be nullJustin Clark-Casey (justincc)2011-07-191-81/+72
|
* Fix undo when changing just the root prim's position in a linkset.Justin Clark-Casey (justincc)2011-07-193-9/+11
| | | | | | I think (ha ha) this largely fixes undo, except for the fact that rotation a set of prims with 'edit linked parts' selected doesn't quite work properly (though this works fine if the checkbox isn't selected). Also, the double undo bug for resize is still present. Redo might be incredibly buggy, haven't even looked at that yet.
* refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for ↵Justin Clark-Casey (justincc)2011-07-193-6/+6
| | | | consistency
* comment out all kinds of debugging guffJustin Clark-Casey (justincc)2011-07-194-44/+44
|
* Fix undo for rotation of the root prim in a linkset on its own.Justin Clark-Casey (justincc)2011-07-192-8/+15
| | | | The only obviously broken things right now are the undo of the position of just a root prim (stays in place) and the fact that resizes need two undoes.
* Fix undo of rotation of single prims in a linksetJustin Clark-Casey (justincc)2011-07-192-9/+11
|
* Fix undo of prim group rotation.Justin Clark-Casey (justincc)2011-07-193-24/+34
| | | | | This isn't that great since I think I broke it a few commits earlier. Undo of rotation of individual prims in a linkset is still broken
* Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what ↵Justin Clark-Casey (justincc)2011-07-192-7/+11
| | | | it actually does and is more consistent with other method names.
* Stop undo of just the root prim position in the linkset from shifting the ↵Justin Clark-Casey (justincc)2011-07-194-14/+20
| | | | | | whole linkset. However, what happens now is that undo just doesn't do anything when the root prim is selected on its own. This requires more code than just fiddling with undo states.
* fix undo when resizing of non-root individual prims in a linksetJustin Clark-Casey (justincc)2011-07-193-4/+11
| | | | undo resize, rotation and position still needs fixing when only editing root prim of a linkset
* Fix undo for resizing linksetsJustin Clark-Casey (justincc)2011-07-194-41/+85
| | | | | | This involves implementing a boolean in UndoState to signal whether the undo needs to be done for an entire group/linkset or just a single prim Resizing individual components of linksets is still dodgy. Resizing still has to be down twice, since for some reason the client is sending two multiobjectupdate packets on every resize except the very first. This applies to single prims and linksets. Need to look into this.
* remove undo state storage in a few places where it's pointlessJustin Clark-Casey (justincc)2011-07-192-5/+1
| | | | no functional effect - existing bugs still remain
* Make various tweaks to undo code in an effort to get things working better.Justin Clark-Casey (justincc)2011-07-186-56/+217
| | | | | | | Undo rotation and position appear to be working. Resizing a single prim appears to be working, though the undo has to be done twice. Resizing a group of prims still does not work properly - possibly because in the UndoState we don't store a knowledge of when we're resizing a whole group rather than individual prims. This needs to be addressed.
* use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.Justin Clark-Casey (justincc)2011-07-182-153/+1
| | | | remove OpenSim.Framework.UndoStack
* Use a standard generic system stack for the undo/redo stacks instead of our ↵Justin Clark-Casey (justincc)2011-07-183-3/+55
| | | | | | | own homebrew. system stack also uses an array, so no performance penalty. Also exposes undo count and adds a test assertion for correct undo count after resize
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-07-186-11/+32
|\