Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 1 | -15/+18 |
| | |||||
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-15 | 4 | -119/+90 |
|\ | |||||
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-02-15 | 1 | -107/+43 |
| |\ | | | | | | | | | | careminster | ||||
| | * | Implement region crossing of sitting avatars. Edit mode and llSetPos work | Melanie | 2012-02-14 | 1 | -102/+38 |
| | | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet. | ||||
| | * | Prevent object loss and positioning outside the region with failed object sim | Melanie | 2012-02-14 | 1 | -5/+5 |
| | | | | | | | | | | | | crossings | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 2 | -10/+37 |
| |\ \ | | |/ | |/| | |||||
| | * | Refactor appearance saving for NPC to use AvatarFactoryModule interface. | Dan Lake | 2012-02-14 | 1 | -9/+31 |
| | | | |||||
| | * | short circuit the expensive parts of the permission checking code | Mic Bowman | 2012-02-13 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | if the current user is the owner of an object. none of the later checks can reverse the outcome. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -2/+10 |
| |\ \ | | |/ | |||||
| | * | Fix bug where somebody taking a copy of an object they didn't own that was ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825 | ||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-10 | 1 | -1/+16 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: prebuild.xml | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -1/+16 |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
| | * | When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -4/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651 | ||||
* | | | initial introdution of physics actor building control. | UbitUmarov | 2012-02-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 2 | -3/+4 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Revert my two quick fixes for the lag issue and put in the real fix, which | Melanie | 2012-02-05 | 1 | -1/+2 |
| | | | | | | | | | | is to only write to the database if data was changed. I was writing to the db on every step of every avatar. Sure to give us lag, that. | ||||
| * | Revert "Remove checks on ban list expiry on every move. To be re-added on ↵ | Melanie | 2012-02-05 | 1 | -4/+4 |
| | | | | | | | | | | | | parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56. | ||||
| * | Revert "Check ban list for a particular parcel only when an avatar moves ↵ | Melanie | 2012-02-05 | 2 | -17/+4 |
| | | | | | | | | | | | | into it." This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461. | ||||
| * | Check ban list for a particular parcel only when an avatar moves into it. | Melanie | 2012-02-05 | 2 | -4/+17 |
| | | | | | | | | | | This restores functionality remove in the last commit without reintroducing the performance penalty. | ||||
| * | Remove checks on ban list expiry on every move. To be re-added on parcel | Melanie | 2012-02-05 | 1 | -4/+4 |
| | | | | | | | | | | boundary crossing only as soon as I'm properly awake. This should fix recent performance issues | ||||
| * | Quiet the map module logging | BlueWall | 2012-02-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 4 | -8/+10 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 1 | -0/+2 |
| |\ | |||||
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 1 | -0/+2 |
| | |\ | |||||
| | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 3 | -8/+8 |
| |/ / | | | | | | | | | | corresponding RemoteAdmin parameter | ||||
| * | | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| |/ | |||||
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 2 | -26/+62 |
| | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
* | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 2 | -27/+57 |
| | | |||||
* | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 1 | -183/+29 |
| | | |||||
* | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 |
| | | |||||
* | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 1 | -0/+12 |
| | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root. | ||||
* | | Re-Add the reading of attachment data hat was lost in the merge | Melanie | 2012-02-02 | 1 | -1/+46 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 3 | -28/+230 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-01 | 2 | -17/+221 |
| |\ | |||||
| | * | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵ | Diva Canto | 2012-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Uri.ToString() drops the port when it's port 80. | ||||
| | * | Add "show part uuid" and "show part name" console commands. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -7/+97 |
| | | | | | | | | | | | | | | | | | | These commands will display part/prim details for a given uuid or name The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset). This is for consistency with the "delete object" commands which only delete objects, not parts. | ||||
| | * | Implement "show object name <name>" console command to show details of an ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -8/+49 |
| | | | | | | | | | | | | object with the given name | ||||
| | * | Get rid of the "no objects found" feedback for now - this doesn't work well ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -11/+13 |
| | | | | | | | | | | | | if a command is executed over multiple scenes. | ||||
| | * | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -5/+56 |
| | | | | | | | | | | | | This will show details about a part with the given uuid if it's found. | ||||
| | * | Add more user feedback if an object isn't found for which delete was requested. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+15 |
| | | | |||||
| | * | Add the name of a deleted object to the console output | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 |
| | | | |||||
| | * | If a particular region is selected in the console, only try to delete ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -16/+21 |
| | | | | | | | | | | | | | | | | | | objects in that region, rather than in every region on the simulator The old wrong behaviour was in place before the command was extracted to a module. | ||||
| * | | Prevent a changed attachment that has been saved from being saved again. | Melanie | 2012-02-01 | 1 | -0/+1 |
| | | | |||||
| * | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -11/+8 |
| |/ | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -0/+206 |
|\ \ | |/ | |||||
| * | Move object delete commands into a commands region module, in preparation ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+206 |
| | | | | | | | | for adding similar show commands. | ||||
| * | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 1 | -4/+84 |
| | | |||||
| * | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 |
| | | |||||
* | | Draw brders around parcels for sale | Melanie | 2012-01-31 | 1 | -11/+37 |
| | |