aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Correct an odd merge anomalyTom Grimshaw2010-05-101-1/+1
|
* Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-05-1039-212/+297
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-05-1019-40/+78
| |\
| | * Return agents when angle is PIMelanie2010-05-101-0/+4
| | | | | | | | | | | | Fixes Mantis #4703
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-1017-38/+74
| | |\
| | | * OK, this really fixes it, I promise.Diva Canto2010-05-091-2/+2
| | | |
| | | * Yey for unit tests. The previous commit had a couple of bugs on SQL ↵Diva Canto2010-05-092-3/+3
| | | | | | | | | | | | | | | | statements. Fixed here.
| | | * * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-0917-36/+72
| | | | | | | | | | | | | | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found.
| | * | Fix a null ref on region crossingMelanie2010-05-101-1/+4
| | |/
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0911-20/+75
| |\ \ | | |/
| | * Add Delete handler to SQLite (NG)Melanie2010-05-091-15/+16
| | |
| | * Implement the "delete" path for assets. Adds a new option to allow remote ↵Melanie2010-05-0911-6/+60
| | | | | | | | | | | | asset deletion in robust handler.
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0916-157/+149
| |\ \ | | |/
| | * Add a field asset_flags and a corresponding enum to the asset database. ThisMelanie2010-05-094-3/+33
| | | | | | | | | | | | | | | | | | | | | CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS WITH LATER ONES. It may also eat your babies, yada, yada, yada. The usual cautions for migrations to the assets table apply. Coding: Can not guarantee nut free.
| | * * Added missing loggout notification to home grid upon agents logging out in ↵Diva Canto2010-05-083-0/+15
| | | | | | | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini
| | * More cleaning on presence. Friends online/offline works again.Diva Canto2010-05-089-154/+101
| | |
* | | Greatly improve login time for users with large friends lists by requesting ↵Tom Grimshaw2010-05-101-6/+39
|/ / | | | | | | all unknown UUID's in one go rather than individually
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-084-28/+40
|\ \
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-05-078-41/+89
| |\ \
| * | | Fix Mouse+WASD makes Av rise; Fix PREJUMP.Kitto Flora2010-05-074-28/+40
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0852-724/+1754
|\ \ \ \ | | |_|/ | |/| |
| * | | test commit for pandadahlia2010-05-071-0/+1
| | | |
| * | | More Git/panda integration Testing..Teravus Ovares (Dan Olivares)2010-05-081-8/+8
| | | |
| * | | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete ↵Diva Canto2010-05-072-9/+1
| | | | | | | | | | | | | | | | fields.
| * | | These files are part of the GridUserService write-up.Diva Canto2010-05-077-0/+702
| | | |
| * | | GridUserService in place. Replaces the contrived concept of storing user's ↵Diva Canto2010-05-0744-3723/+3797
| | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs.
| * | | improve handling of undersize sculpt texturesdahlia2010-05-061-4/+11
| | | |
| * | | corrections for face numbering and uv mapping, mostly for spheres - sync ↵dahlia2010-05-061-2201/+2284
| | | | | | | | | | | | | | | | with PrimMesher r56
| * | | Sculpt meshing refactoring - improves mesh accuracy and UV mappingdahlia2010-05-062-639/+810
| | | | | | | | | | | | | | | | Sync with PrimMesher r55
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-071-0/+2
|\ \ \ \ | |/ / /
| * | | Also remove sale and search flags on god owner change.Melanie2010-05-071-0/+1
| | | |
| * | | Remove land that is being abandoned from search. This is now consistent withMelanie2010-05-071-0/+1
| | | | | | | | | | | | | | | | sale and reclaim.
| * | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵Melanie2010-05-065-206/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" Causes an exception within HttpServer, headers have already been sent. This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc.
* | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵Melanie2010-05-065-206/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" Causes an exception within HttpServer, headers have already been sent. This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-0611-117/+156
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-066-10/+36
| |\ \ \
| | * | | * Fixes Library bugs in grid mode. Partly a missing check and partly a ↵Diva Canto2010-05-055-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing configuration. * Made previous Robust config changes consistent in Robust.HG.ini.example
| | * | | * Fixes LandDataSerializerTests on Windows by stripping CR from the ↵Teravus Ovares (Dan Olivares)2010-05-051-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serialization result since the reference serialization has LF only. * Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
| * | | | Ensure the show in search flag is cleared on ownership change. Also, whenMelanie2010-05-062-1/+8
| |/ / / | | | | | | | | | | | | | | | | land is reclaimed, reset it's for sale flags so it can't be bought again right away.
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-053-106/+112
| |\ \ \
| | * | | Added copying of Viewer field to the agent circuit data that is being passed ↵Diva Canto2010-05-053-106/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TPs and crossings. (XmlRpcGroups files want to be committed too)
| * | | | Remove the m_Viewer variable and make the property a shortcut to theMelanie Thielker2010-05-052-7/+1
| |/ / / | | | | | | | | | | | | proper field in AgentCircuitData instead
* | | | Remove the m_Viewer variable and make the property a shortcut to theMelanie Thielker2010-05-062-7/+1
| | | | | | | | | | | | | | | | proper field in AgentCircuitData instead
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-058-545/+354
|\ \ \ \ | |/ / /
| * | | Stab a test failMelanie2010-05-051-1/+3
| | | |
| * | | Plumb Viewer version into ScenePresence for initial login. It's still notMelanie Thielker2010-05-052-0/+2
| | | | | | | | | | | | | | | | carried along
| * | | Plumb the viewer version string through into AgentCircuitData. Now all thatMelanie Thielker2010-05-055-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data.
| * | | Add a XMLRPC method to remotely set the login level for the LLLoginService.Melanie Thielker2010-05-055-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level.
| * | | Removed a test for a "can't happen" case. ParentGroup is never null anymore.Melanie Thielker2010-05-051-9/+1
| | | |
| * | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groupsMelanie2010-05-055-542/+312
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
generated by cgit v1.1 at 2024-11-18 04:30:48 +0000